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

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox-extracted.js

Issue 1401633002: Update Polymer from 1.1.4 -> 1.1.5 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dzhioev@ review Created 5 years, 2 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/paper-checkbox/paper-checkbox-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox-extracted.js b/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox-extracted.js
index 6264cf9d8b8ab6279392f03767c8bbce433f9c0a..d5952183d02504e2ecebdb2131bb4764cd7cbe01 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox-extracted.js
@@ -1,10 +1,8 @@
-
- Polymer({
+Polymer({
is: 'paper-checkbox',
behaviors: [
- Polymer.PaperInkyFocusBehavior,
- Polymer.IronCheckedElementBehavior
+ Polymer.PaperCheckedElementBehavior
],
hostAttributes: {
@@ -31,37 +29,6 @@
}
},
- attached: function() {
- this._isReady = true;
-
- // Don't stomp over a user-set aria-label.
- if (!this.getAttribute('aria-label')) {
- this.updateAriaLabel();
- }
- },
-
- /**
- * Update the checkbox aria-label. This is a temporary workaround not
- * being able to observe changes in <content>
- * (see: https://github.com/Polymer/polymer/issues/1773)
- *
- * Call this if you manually change the contents of the checkbox
- * and want the aria-label to match the new contents.
- */
- updateAriaLabel: function() {
- this.setAttribute('aria-label', Polymer.dom(this).textContent.trim());
- },
-
- // button-behavior hook
- _buttonStateChanged: function() {
- if (this.disabled) {
- return;
- }
- if (this._isReady) {
- this.checked = this.active;
- }
- },
-
_computeCheckboxClass: function(checked, invalid) {
var className = '';
if (checked) {
@@ -75,6 +42,12 @@
_computeCheckmarkClass: function(checked) {
return checked ? '' : 'hidden';
+ },
+
+ // create ripple inside the checkboxContainer
+ _createRipple: function() {
+ this._rippleContainer = this.$.checkboxContainer;
+ return Polymer.PaperInkyFocusBehaviorImpl._createRipple.call(this);
}
- });
-
+
+ });

Powered by Google App Engine
This is Rietveld 408576698