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

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

Issue 1862213002: Roll third_party/polymer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete appearance_browsertest.js, result of a previous bad merge. Created 4 years, 8 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-slider/paper-slider-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js
index 1820d79d4356b8d18c46e35b3c299a1bed7dfbda..03e72d8840c2f2d13f8bf894f571c8578b9e9667 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js
@@ -278,6 +278,9 @@ Polymer({
// cancel selection
event.preventDefault();
+
+ // set the focus manually because we will called prevent default
+ this.focus();
},
_knobTransitionEnd: function(event) {
@@ -290,7 +293,7 @@ Polymer({
if (!this.snaps) {
this._setMarkers([]);
}
- var steps = Math.floor((this.max - this.min) / this.step);
+ var steps = Math.round((this.max - this.min) / this.step);
if (steps > maxMarkers) {
steps = maxMarkers;
}
@@ -364,9 +367,9 @@ Polymer({
if (this.hasRipple()) {
// note, ripple must be un-hidden prior to setting `holdDown`
if (receivedFocusFromKeyboard) {
- this._ripple.removeAttribute('hidden');
+ this._ripple.style.display = '';
} else {
- this._ripple.setAttribute('hidden', '');
+ this._ripple.style.display = 'none';
}
this._ripple.holdDown = receivedFocusFromKeyboard;
}

Powered by Google App Engine
This is Rietveld 408576698