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

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

Issue 2646943003: Polymer: roll paper-slider, 1.0.11 -> 1.0.13 (Closed)
Patch Set: Rebase Created 3 years, 11 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 d495c5ae64b21142ccce087e4c77ab391a4c6e3f..b555b0a43bafe40f50066bbb8433abcbbdea2b7f 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
@@ -95,7 +95,9 @@ Polymer({
markers: {
type: Array,
readOnly: true,
- value: []
+ value: function() {
+ return [];
+ }
},
},
@@ -206,12 +208,12 @@ Polymer({
this._setDragging(true);
},
- _trackX: function(e) {
+ _trackX: function(event) {
if (!this.dragging) {
- this._trackStart(e);
+ this._trackStart(event);
}
- var dx = Math.min(this._maxx, Math.max(this._minx, e.detail.dx));
+ var dx = Math.min(this._maxx, Math.max(this._minx, event.detail.dx));
this._x = this._startx + dx;
var immediateValue = this._calcStep(this._calcKnobPosition(this._x / this._w));
@@ -321,6 +323,7 @@ Polymer({
this.increment();
}
this.fire('change');
+ event.preventDefault();
}
},
@@ -332,6 +335,7 @@ Polymer({
this.decrement();
}
this.fire('change');
+ event.preventDefault();
}
},
@@ -379,7 +383,7 @@ Polymer({
* Fired when the slider's immediateValue changes. Only occurs while the
* user is dragging.
*
- * To detect changes to immediateValue that happen for any input (i.e.
+ * To detect changes to immediateValue that happen for any input (i.e.
* dragging, tapping, clicking, etc.) listen for immediate-value-changed
* instead.
*

Powered by Google App Engine
This is Rietveld 408576698