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

Updated the Check routine and put it into a temp. fcuntion for better readability

Browse source
This commit is contained in:
Marc 2015-04-27 20:55:06 +02:00
parent d4a96c53c3
commit 2a5a0282cb
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,30 +155,40 @@ $(function() {
}
if (control.hasOwnProperty("input")) {
for (var i = 0; i < control.input.length; i++) {
if (control.input[i].hasOwnProperty("slider") && typeof control.input[i].slider == "object") {
var param = control.input[i].hasOwnProperty("defaultValue") && !isNaN(control.input[i].defaultValue) && control.input[i].defaultValue != undefined && control.input[i].defaultValue != "" ?
control.input[i].defaultValue : (control.input[i].slider.hasOwnProperty("min") && !isNaN(control.input[i].slider.min) && control.input[i].slider.min != undefined && control.input[i].slider.min != "" ?
control.input[i].slider.min : 0);
correctlyDefined = function (e, key) {
return e.hasOwnProperty(key) && !isNaN(e[key]) && e[key] != undefined && e[key] != "";
};
_.each(control.input, function (element, index, list) {
if (element.hasOwnProperty("slider") && typeof element.slider == "object") {
var correctMin = correctlyDefined(element.slider, "min");
var correctMax = correctlyDefined(element.slider, "max");
var param = 0;
if (correctlyDefined(element, "defaultValue")) {
param = element.defaultValue;
}
else if (correctMin)
param = element.slider.min;
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 (correctMin && param < element.slider.min)
param = element.slider.min;
if (control.input[i].slider.hasOwnProperty("max") && param > control.input[i].slider.max)
param = control.input[i].slider.max;
if (correctMax && param > element.slider.max)
param = element.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 : "");
}
}
element.value = ko.observable(param);
} else {
element.slider = false;
element.value = ko.observable(correctlyDefined(element, "defaultValue") ? element.defaultValue : undefined);
}
});
}
var js;