ManuelW/octoprint-customControl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small Fixes, and a README

Browse Source
This commit is contained in:
Marc
2015-04-26 22:42:43 +02:00
parent 6227e12dcd
commit c2f6afcb5e
5 changed files with 74 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
octoprint_customControl/static/js/customControl.js
View File

@ -73,7 +73,7 @@
var input = {
name: ko.observable(list[i].name),
parameter: ko.observable(list[i].parameter),
defaultValue: ko.observable(list[i].defaultValue || "0")
defaultValue: ko.observable(list[i].defaultValue != "" ? list[i].defaultValue : undefined),
};
if (list[i].hasOwnProperty("slider") && typeof list[i].slider == "object") {
@ -82,9 +82,25 @@
max: ko.observable(list[i].slider.max),
step: ko.observable(list[i].slider.step),
}
var param = list[i].hasOwnProperty("defaultValue") && !isNaN(list[i].defaultValue) && list[i].defaultValue != undefined && list[i].defaultValue != "" ? list[i].defaultValue : (list[i].slider.hasOwnProperty("min") && !isNaN(list[i].slider.min) && list[i].slider.min != undefined && list[i].slider.min != "" ? list[i].slider.min : 0);
if (typeof param == "string")
param = parseInt(param);
if (list[i].slider.hasOwnProperty("min") && param < list[i].slider.min)
param = list[i].slider.min;
if (list[i].slider.hasOwnProperty("max") && param > list[i].slider.max)
param = list[i].slider.max;
if (typeof param == "string")
param = parseInt(param);
input.value = ko.observable(param);
}
else {
input.slider = false;
input.value = ko.observable(!isNaN(list[i].defaultValue) ? list[i].defaultValue : undefined);
}
inputs.push(input);
@ -385,6 +401,22 @@
}
break;
}
case "script": {
element.name(ret.name);
element.script = ret.script;
if (ret.confirm != "") {
element.confirm = ret.confirm;
}
if (ret.input != undefined) {
element.input(self._processInput(ret.input));
}
else
delete element.input;
break;
}
case "output": {
element.template(ret.template);
element.regex(ret.regex);

28
octoprint_customControl/static/js/customControlDialog.js
View File

@ -120,12 +120,14 @@
var input = {
name: element.name,
parameter: element.parameter,
defaultValue: element.defaultValue
defaultValue: !isNaN(element.defaultValue) ? element.defaultValue : undefined
};
if (element.hasOwnProperty("slider") && element.slider != false) {
input["slider"] = {
};
input.defaultValue = !isNaN(element.defaultValue) && element.defaultValue != undefined && element.defaultValue != "" ? parseInt(element.defaultValue) : undefined;
if (element.slider.hasOwnProperty("min") && element.slider.min != "")
input.slider.min = element.slider.min;
if (element.slider.hasOwnProperty("max") && element.slider.max != "")
@ -160,18 +162,20 @@
var input = {
name: element.name,
parameter: element.parameter,
defaultValue: element.defaultValue
defaultValue: !isNaN(element.defaultValue) ? element.defaultValue : undefined
};
if (element.hasOwnProperty("slider") && element.slider != false) {
input["slider"] = {
};
if (element.slider.hasOwnProperty("min") && element.slider.min != "")
input.slider.min = element.slider.min;
if (element.slider.hasOwnProperty("max") && element.slider.max != "")
input.slider.max = element.slider.max;
if (element.slider.hasOwnProperty("step") && element.slider.step != "")
input.slider.step = element.slider.step;
input.defaultValue = !isNaN(element.defaultValue) && element.defaultValue != undefined && element.defaultValue != "" ? parseInt(element.defaultValue) : undefined;
if (element.slider.min != "")
input.slider.min = parseInt(element.slider.min);
if (element.slider.max != "")
input.slider.max = parseInt(element.slider.max);
if (element.slider.step != "")
input.slider.step = parseInt(element.slider.step);
}
el.input.push(input);
@ -217,11 +221,11 @@
var obj = {
name: ko.observable(""),
parameter: ko.observable(""),
defaultValue: ko.observable(""),
defaultValue: ko.observable(),
slider: {
min: ko.observable(""),
max: ko.observable(""),
step: ko.observable("")
min: ko.observable(),
max: ko.observable(),
step: ko.observable()
}
}