third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js - Issue 1468623004: Update Polymer from 1.2.1 -> 1.2.3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1468623004: Update Polymer from 1.2.1 -> 1.2.3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@travis-yml

Patch Set: local-state.html Created 5 years, 1 month 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

« components/proximity_auth/webui/resources/local-state.html ('K') | « third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html ('k') | third_party/polymer/v1_0/components-chromium/paper-spinner/.travis.yml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 eabb9bfbfb44655b5d34fec5fcf6565ee6d33c42..51b615cf97dc4de5633fd6c0f801f1161e5c08d1 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

@@ -282,12 +282,14 @@ Polymer({

_maxMarkersChanged: function(maxMarkers) {

- var l = (this.max - this.min) / this.step;

- if (!this.snaps && l > maxMarkers) {

+ if (!this.snaps) {

this._setMarkers([]);

- } else {

- this._setMarkers(new Array(l));

}

+ var steps = Math.floor((this.max - this.min) / this.step);

+ if (steps > maxMarkers) {

+ steps = maxMarkers;

+ }

+ this._setMarkers(new Array(steps));

_mergeClasses: function(classes) {