upgrade paper-slider and remove min-max hack (#252)

This commit is contained in:
Andrey 2017-04-03 03:37:39 +03:00 committed by Paulus Schoutsen
parent 7f69540a92
commit 9aa188079e
2 changed files with 4 additions and 15 deletions

View File

@ -20,11 +20,11 @@
"polymer": "Polymer/polymer#~1.8.0", "polymer": "Polymer/polymer#~1.8.0",
"vaadin-combo-box": "vaadin/vaadin-combo-box#~1.1.5", "vaadin-combo-box": "vaadin/vaadin-combo-box#~1.1.5",
"vaadin-date-picker": "^1.2.1", "vaadin-date-picker": "^1.2.1",
"paper-slider": "1.0.13", "paper-slider": "1.0.14",
"leaflet": "^1.0.2", "leaflet": "^1.0.2",
"polymer-sortablejs": "^0.1.3" "polymer-sortablejs": "^0.1.3"
}, },
"resolutions": { "resolutions": {
"paper-slider": "1.0.13" "paper-slider": "1.0.14"
} }
} }

View File

@ -61,19 +61,8 @@ Polymer({
stateObjectChanged: function (newVal) { stateObjectChanged: function (newVal) {
this.value = Number(newVal.state); this.value = Number(newVal.state);
var min = Number(newVal.attributes.min); this.min = Number(newVal.attributes.min);
var max = Number(newVal.attributes.max); this.max = Number(newVal.attributes.max);
// Polymer doesn't batch attribute updates
// And input_slider blows up when min > max.
if (max <= this.min) {
this.min = min;
this.max = max;
} else {
this.max = max;
this.min = min;
}
this.step = Number(newVal.attributes.step); this.step = Number(newVal.attributes.step);
}, },