milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update polymer

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-17 11:35:09 -05:00
parent 64e22073e0
commit 3223d4672a
55 changed files with 359 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dashboard-ui/bower_components/iron-behaviors/iron-button-state.html vendored
View file

@ -136,14 +136,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
this._setPressed(false);
},
__isFocusedLightDescendant: function(target) {
var root = Polymer.dom(this).getOwnerRoot() || document;
var focusedElement = root.activeElement;
// TODO(noms): remove the `this !== target` check once polymer#2610 is fixed.
return this !== target && this.isLightDescendant(target) && target == focusedElement;
},
/**
* @param {!KeyboardEvent} event .
*/
@ -153,7 +145,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
// Ignore the event if this is coming from a focused light child, since that
// element will deal with it.
if (this.__isFocusedLightDescendant(target))
if (this.isLightDescendant(target))
return;
keyboardEvent.preventDefault();
@ -170,7 +162,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
// Ignore the event if this is coming from a focused light child, since that
// element will deal with it.
if (this.__isFocusedLightDescendant(target))
if (this.isLightDescendant(target))
return;
if (this.pressed) {