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

Unified Diff: third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js

Issue 1287713002: [MD settings] merge polymer 1.0.11; hack for settings checkbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js
index d84e4eeda12c65b8e070b4578d315059b27a1e72..c00882f2f43ffc80c31f5bec89ece0af452ab38a 100644
--- a/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js
@@ -1,6 +1,4 @@
-
-
- /**
+/**
* @demo demo/index.html
* @polymerBehavior
*/
@@ -48,11 +46,6 @@
],
ready: function() {
- // TODO(sjmiles): ensure read-only property is valued so the compound
- // observer will fire
- if (this.focused === undefined) {
- this._setFocused(false);
- }
this.addEventListener('focus', this._boundFocusBlurHandler, true);
this.addEventListener('blur', this._boundFocusBlurHandler, true);
},
@@ -63,7 +56,6 @@
var focused = event.type === 'focus';
this._setFocused(focused);
} else if (!this.shadowRoot) {
- event.stopPropagation();
this.fire(event.type, {sourceEvent: event}, {
node: this,
bubbles: event.bubbles,
@@ -91,5 +83,4 @@
}
}
- };
-
+ };

Powered by Google App Engine
This is Rietveld 408576698