Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Unified Diff: polymer_0.5.4/bower_components/paper-button/paper-button-base.html

Issue 895523005: Added Polymer 0.5.4 (Closed) Base URL: https://chromium.googlesource.com/infra/third_party/npm_modules.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: polymer_0.5.4/bower_components/paper-button/paper-button-base.html
diff --git a/polymer_0.5.0/bower_components/paper-button/paper-button-base.html b/polymer_0.5.4/bower_components/paper-button/paper-button-base.html
similarity index 66%
copy from polymer_0.5.0/bower_components/paper-button/paper-button-base.html
copy to polymer_0.5.4/bower_components/paper-button/paper-button-base.html
index 8f62aa72e448b9b784067bc783bd7d73246c29ba..2d4df6b81318003796fe54faaa4c1c5103aed8bc 100644
--- a/polymer_0.5.0/bower_components/paper-button/paper-button-base.html
+++ b/polymer_0.5.4/bower_components/paper-button/paper-button-base.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
`paper-button-base` is the base class for button-like elements with ripple and optional shadow.
@element paper-button-base
-@mixins Polymer.CoreFocusable
+@mixins Polymer.CoreFocusable https://github.com/polymer/core-focusable
@status unstable
-->
@@ -30,22 +30,48 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
var p = {
eventDelegates: {
- down: 'downAction'
+ down: 'downAction',
+ up: 'upAction'
+ },
+
+ toggleBackground: function() {
+ if (this.active) {
+
+ if (!this.$.bg) {
+ var bg = document.createElement('div');
+ bg.setAttribute('id', 'bg');
+ bg.setAttribute('fit', '');
+ bg.style.opacity = 0.25;
+ this.$.bg = bg;
+ this.shadowRoot.insertBefore(bg, this.shadowRoot.firstChild);
+ }
+ this.$.bg.style.backgroundColor = getComputedStyle(this).color;
+
+ } else {
+
+ if (this.$.bg) {
+ this.$.bg.style.backgroundColor = '';
+ }
+ }
},
activeChanged: function() {
this.super();
- if (this.$.ripple) {
- if (this.active) {
- // FIXME: remove when paper-ripple can have a default 'down' state.
- if (!this.lastEvent) {
- var rect = this.getBoundingClientRect();
- this.lastEvent = {
- x: rect.left + rect.width / 2,
- y: rect.top + rect.height / 2
- }
- }
+ if (this.toggle && (!this.lastEvent || this.matches(':host-context([noink])'))) {
+ this.toggleBackground();
+ }
+ },
+
+ pressedChanged: function() {
+ this.super();
+
+ if (!this.lastEvent) {
+ return;
+ }
+
+ if (this.$.ripple && !this.hasAttribute('noink')) {
+ if (this.pressed) {
this.$.ripple.downAction(this.lastEvent);
} else {
this.$.ripple.upAction();
@@ -55,6 +81,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
this.adjustZ();
},
+ focusedChanged: function() {
+ this.adjustZ();
+ },
+
disabledChanged: function() {
this._disabledChanged();
this.adjustZ();
@@ -80,6 +110,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
this.$.shadow.setZ(2);
} else if (this.disabled) {
this.$.shadow.setZ(0);
+ } else if (this.focused) {
+ this.$.shadow.setZ(3);
} else {
this.$.shadow.setZ(1);
}
@@ -108,6 +140,17 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
// No need to forward the event to the ripple because the ripple
// is triggered in activeChanged
}
+ },
+
+ upAction: function() {
+ this._upAction();
+
+ if (this.toggle) {
+ this.toggleBackground();
+ if (this.$.ripple) {
+ this.$.ripple.cancel();
+ }
+ }
}
};

Powered by Google App Engine
This is Rietveld 408576698