From 9c9604461e6a83b463ff61518aa0baceb93d2cc1 Mon Sep 17 00:00:00 2001
From: Andrew Hollandmoritz
Date: Wed, 4 May 2016 05:08:23 -0400
Subject: [PATCH 1/7] Added fab and mini classname bindings to paper-button,
defined defaults for them and iconButton, raised properties
---
addon/components/paper-button.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/addon/components/paper-button.js b/addon/components/paper-button.js
index b8ec697d4..a128bb6dc 100644
--- a/addon/components/paper-button.js
+++ b/addon/components/paper-button.js
@@ -11,9 +11,15 @@ export default BaseFocusable.extend(RippleMixin, ProxiableMixin, ColorMixin, {
type: 'button',
tagName: 'button',
classNames: ['paper-button', 'md-default-theme', 'md-button'],
+ raised: false,
+ iconButton: false,
+ fab: false, //circular button
+ mini: false,
classNameBindings: [
'raised:md-raised',
- 'iconButton:md-icon-button'
+ 'iconButton:md-icon-button',
+ 'fab:md-fab',
+ 'mini:md-mini'
],
// Ripple Overrides
From 5b3437a236a7e6c5c2248365e0d43c7bf7b1dcfa Mon Sep 17 00:00:00 2001
From: Andrew Hollandmoritz
Date: Wed, 4 May 2016 05:11:12 -0400
Subject: [PATCH 2/7] style fix
---
addon/components/paper-button.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addon/components/paper-button.js b/addon/components/paper-button.js
index a128bb6dc..1a3c958dd 100644
--- a/addon/components/paper-button.js
+++ b/addon/components/paper-button.js
@@ -13,7 +13,7 @@ export default BaseFocusable.extend(RippleMixin, ProxiableMixin, ColorMixin, {
classNames: ['paper-button', 'md-default-theme', 'md-button'],
raised: false,
iconButton: false,
- fab: false, //circular button
+ fab: false, // circular button
mini: false,
classNameBindings: [
'raised:md-raised',
From 4309bbc22faf68cd7479faa54cdff373fe367fbb Mon Sep 17 00:00:00 2001
From: Andrew Hollandmoritz
Date: Wed, 4 May 2016 05:13:27 -0400
Subject: [PATCH 3/7] Added tests for paper-button to ensure that md-mini and
md-fab classes when their respective properties are defined
---
.../components/paper-button-test.js | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tests/integration/components/paper-button-test.js b/tests/integration/components/paper-button-test.js
index 1297209ef..d980f78c8 100644
--- a/tests/integration/components/paper-button-test.js
+++ b/tests/integration/components/paper-button-test.js
@@ -70,3 +70,21 @@ test('uses md-icon-button class when iconButton=true', function(assert) {
`);
assert.ok(this.$('.md-button').hasClass('md-icon-button'));
});
+
+test('uses md-fab class when fab=true', function(assert) {
+ this.render(hbs`
+ {{#paper-button fab=true}}
+ A label
+ {{/paper-button}}
+ `);
+ assert.ok(this.$('.md-button').hasClass('md-fab'));
+});
+
+test('uses md-mini class when mini=true', function(assert) {
+ this.render(hbs`
+ {{#paper-button mini=true}}
+ A label
+ {{/paper-button}}
+ `);
+ assert.ok(this.$('.md-button').hasClass('md-mini'));
+});
From 227b29e55679a07f893ed48a941a2c7bc9958cd9 Mon Sep 17 00:00:00 2001
From: Andrew Hollandmoritz
Date: Wed, 4 May 2016 05:48:54 -0400
Subject: [PATCH 4/7] added fab and mini to docs
---
tests/dummy/app/templates/button.hbs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/dummy/app/templates/button.hbs b/tests/dummy/app/templates/button.hbs
index 2d1b3d55f..b4ab9f697 100644
--- a/tests/dummy/app/templates/button.hbs
+++ b/tests/dummy/app/templates/button.hbs
@@ -27,6 +27,8 @@
{{#paper-button raised=true primary=true onClick=(action "targetButton") bubbles=false}}Button no bubble{{/paper-button}}
+ {{#paper-button raised=true fab=true}}Fab{{/paper-button}}
+ {{#paper-button raised=true fab=true mini=true}}Mini{{/paper-button}}
{{#paper-button iconButton=true}}{{paper-icon "accessibility"}}{{/paper-button}}
{{/custom-button}}
@@ -53,6 +55,8 @@
\{{#paper-button raised=true primary=true onClick=(action "targetButton") bubbles=false}}Button no bubble\{{/paper-button}}
</p>
<p>
+ \{{#paper-button raised=true fab=true}}Fab\{{/paper-button}}
+ \{{#paper-button raised=true fab=true mini=true}}Mini\{{/paper-button}}
\{{#paper-button iconButton=true}}\{{paper-icon "more-vert"}}\{{/paper-button}}
</p>
<p>
From f9955dfa801d06cfee7289e44ad8504b9de9a70d Mon Sep 17 00:00:00 2001
From: Andrew Hollandmoritz
Date: Thu, 5 May 2016 06:08:24 -0400
Subject: [PATCH 5/7] Update md-button-test to check that when mini=true both
md-fab and md-mini classes are present
---
tests/integration/components/paper-button-test.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/integration/components/paper-button-test.js b/tests/integration/components/paper-button-test.js
index d980f78c8..b13f70393 100644
--- a/tests/integration/components/paper-button-test.js
+++ b/tests/integration/components/paper-button-test.js
@@ -80,11 +80,11 @@ test('uses md-fab class when fab=true', function(assert) {
assert.ok(this.$('.md-button').hasClass('md-fab'));
});
-test('uses md-mini class when mini=true', function(assert) {
+test('uses md-mini and md-fab class when mini=true', function(assert) {
this.render(hbs`
{{#paper-button mini=true}}
A label
{{/paper-button}}
`);
- assert.ok(this.$('.md-button').hasClass('md-mini'));
+ assert.ok(this.$('.md-button').is('.md-fab', '.md-mini'));
});
From c92f0efa1524683ea7ea5aee40ee41945f861088 Mon Sep 17 00:00:00 2001
From: Andrew Hollandmoritz
Date: Thu, 5 May 2016 06:10:33 -0400
Subject: [PATCH 6/7] updated paper-button so that when mini=true it will set
md-fab and md-mini
---
addon/components/paper-button.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addon/components/paper-button.js b/addon/components/paper-button.js
index 1a3c958dd..7dda9c9eb 100644
--- a/addon/components/paper-button.js
+++ b/addon/components/paper-button.js
@@ -13,7 +13,7 @@ export default BaseFocusable.extend(RippleMixin, ProxiableMixin, ColorMixin, {
classNames: ['paper-button', 'md-default-theme', 'md-button'],
raised: false,
iconButton: false,
- fab: false, // circular button
+ fab: computed.reads('mini'), // circular button
mini: false,
classNameBindings: [
'raised:md-raised',
From ddc584aca90d2b7937d2fe52f111101e92afffc9 Mon Sep 17 00:00:00 2001
From: Andrew Hollandmoritz
Date: Thu, 5 May 2016 06:13:00 -0400
Subject: [PATCH 7/7] updated dummy app to reflect mini=true changes to the
paper-button
---
tests/dummy/app/templates/button.hbs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/dummy/app/templates/button.hbs b/tests/dummy/app/templates/button.hbs
index b4ab9f697..ab96ba40c 100644
--- a/tests/dummy/app/templates/button.hbs
+++ b/tests/dummy/app/templates/button.hbs
@@ -28,7 +28,7 @@
{{#paper-button raised=true fab=true}}Fab{{/paper-button}}
- {{#paper-button raised=true fab=true mini=true}}Mini{{/paper-button}}
+ {{#paper-button raised=true mini=true}}Mini{{/paper-button}}
{{#paper-button iconButton=true}}{{paper-icon "accessibility"}}{{/paper-button}}
{{/custom-button}}
@@ -56,7 +56,7 @@
</p>
<p>
\{{#paper-button raised=true fab=true}}Fab\{{/paper-button}}
- \{{#paper-button raised=true fab=true mini=true}}Mini\{{/paper-button}}
+ \{{#paper-button raised=true mini=true}}Mini\{{/paper-button}}
\{{#paper-button iconButton=true}}\{{paper-icon "more-vert"}}\{{/paper-button}}
</p>
<p>