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

Unified Diff: chrome/browser/resources/settings/checkbox/checkbox.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
« no previous file with comments | « no previous file | third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/checkbox/checkbox.js
diff --git a/chrome/browser/resources/settings/checkbox/checkbox.js b/chrome/browser/resources/settings/checkbox/checkbox.js
index d4bdeb4fc378da44e7864b61c7b6c070f9f80383..39dd913db5fdd3f4f0b3f17039498286637c5b82 100644
--- a/chrome/browser/resources/settings/checkbox/checkbox.js
+++ b/chrome/browser/resources/settings/checkbox/checkbox.js
@@ -57,6 +57,15 @@ Polymer({
this.$.events.forward(this.$.checkbox, ['change']);
},
+ /** @override */
+ attached: function() {
+ // HACK(dschuyler): paper-checkbox 1.0.6 will hide the label
+ // if the content is empty.
+ // TODO(dschuyler): rework settings checkbox to use content
+ // rather than spans.
+ this.$.checkbox.$.checkbox.$.checkboxLabel.hidden = false;
+ },
stevenjb 2015/08/13 21:44:38 Is there any reason why this was done here instead
+
/** @private */
prefValueChanged_: function(prefValue) {
// prefValue is initially undefined when Polymer initializes pref.
« no previous file with comments | « no previous file | third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698