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

Unified Diff: third_party/polymer/components/iron-behaviors/iron-control-state.html

Issue 2113853002: Run bower update (Closed) Base URL: https://github.com/catapult-project/catapult@polymer10-migration
Patch Set: Created 4 years, 6 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: third_party/polymer/components/iron-behaviors/iron-control-state.html
diff --git a/third_party/polymer/components/iron-behaviors/iron-control-state.html b/third_party/polymer/components/iron-behaviors/iron-control-state.html
index 4b7c615c8f8dad6f2bd2c59b17fa97c8e977da53..f34d057994a0207742de5f4b2be9fc0d8314ad83 100644
--- a/third_party/polymer/components/iron-behaviors/iron-control-state.html
+++ b/third_party/polymer/components/iron-behaviors/iron-control-state.html
@@ -73,12 +73,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
if (event.target === this) {
this._setFocused(event.type === 'focus');
- } else if (!this.shadowRoot && !this.isLightDescendant(event.target)) {
- this.fire(event.type, {sourceEvent: event}, {
- node: this,
- bubbles: event.bubbles,
- cancelable: event.cancelable
- });
+ } else if (!this.shadowRoot) {
+ var target = /** @type {Node} */(Polymer.dom(event).localTarget);
+ if (!this.isLightDescendant(target)) {
+ this.fire(event.type, {sourceEvent: event}, {
+ node: this,
+ bubbles: event.bubbles,
+ cancelable: event.cancelable
+ });
+ }
}
},

Powered by Google App Engine
This is Rietveld 408576698