| Index: third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js
|
| diff --git a/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js
|
| index 936987f558496580a49ec67794e03c29da0c243e..d7653a9f82104172fc851ed1fd031a1a571477b9 100644
|
| --- a/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js
|
| +++ b/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js
|
| @@ -120,14 +120,6 @@
|
| 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 .
|
| */
|
| @@ -137,7 +129,7 @@
|
|
|
| // 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();
|
| @@ -154,7 +146,7 @@
|
|
|
| // 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) {
|
|
|