pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Slider DefaultValue always an Int and in range(min, max)

Browse source
This commit is contained in:
Marc 2015-04-24 14:46:41 +02:00
parent 3ebc6f0f1d
commit 17889a2b46
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/octoprint/static/js/app/viewmodels/control.js
View file

@ -156,9 +156,24 @@ $(function() {
if (control.hasOwnProperty("input")) {
for (var i = 0; i < control.input.length; i++) {
control.input[i].value = ko.observable(control.input[i].defaultValue || "0");
if (!control.input[i].hasOwnProperty("slider")) {
control.input[i].slider = false;
if (control.input[i].hasOwnProperty("slider") && typeof control.input[i].slider == "object") {
var param = control.input[i].hasOwnProperty("defaultValue") ? control.input[i].defaultValue : (control.input[i].slider.hasOwnProperty("min") ? control.input[i].slider.min : 0);
if (typeof param == "string")
param = parseInt(param);
if (control.input[i].slider.hasOwnProperty("min") && param < control.input[i].slider.min)
param = control.input[i].slider.min;
if (control.input[i].slider.hasOwnProperty("max") && param > control.input[i].slider.max)
param = control.input[i].slider.max;
if (typeof param == "string")
param = parseInt(param);
control.input[i].value = ko.observable(param);
} else {
control.input[i].slider = false;
control.input[i].value = ko.observable(control.input[i].hasOwnProperty("defaultValue") ? control.input[i].defaultValue : "");
}
}
}