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

Make sure already processed custom controls don't get processed twice

Browse source 
Fixes an issue causing feedback controls to stop working if additional plugin controls are added
This commit is contained in:
Gina Häußge 2015-03-10 11:19:58 +01:00
parent a956abd65a
commit 9d761c4ee9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,10 @@ $(function() {
};
self._processControl = function (control) {
if (control.hasOwnProperty("processed") && control.processed) {
return control;
}
if (_.startsWith(control.type, "parametric_")) {
for (var i = 0; i < control.input.length; i++) {
control.input[i].value = ko.observable(control.input[i].default);
@ -129,7 +133,7 @@ $(function() {
control.input[i].slider = false;
}
}
} else if (control.type == "feedback_command" || control.type == "feedback") {
} else if ((control.type == "feedback_command" || control.type == "feedback") && !control.hasOwnProperty("output")) {
control.output = ko.observable("");
self.feedbackControlLookup[control.name] = control.output;
} else if (control.type == "section" || control.type == "row" || control.type == "section_row") {
@ -159,6 +163,7 @@ $(function() {
}
}
control.processed = true;
return control;
};