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

Merge branch 'Booli-confirmCustomCommand' into devel

Browse source
This commit is contained in:
Gina Häußge 2014-09-23 18:58:46 +02:00
commit a7144e57e1
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -21,3 +21,5 @@ dist
pypy
OctoPrint.egg-info
*.orig
*.codekit

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

@ -190,6 +190,15 @@ function ControlViewModel(loginStateViewModel, settingsViewModel) {
if (!command)
return;
var callback = function (){
$.ajax({
url: API_BASEURL + "printer/command",
type: "POST",
dataType: "json",
contentType: "application/json; charset=UTF-8",
data: JSON.stringify(data)
})
}
var data = undefined;
if (command.type == "command" || command.type == "parametric_command" || command.type == "feedback_command") {
// single command
@ -207,16 +216,25 @@ function ControlViewModel(loginStateViewModel, settingsViewModel) {
}
}
if (command.confirm) {
var confirmationDialog = $("#confirmation_dialog");
var confirmationDialogAck = $(".confirmation_dialog_acknowledge", confirmationDialog);
$(".confirmation_dialog_message", confirmationDialog).text(command.confirm);
confirmationDialogAck.unbind("click");
confirmationDialogAck.bind("click", function(e) {
e.preventDefault();
$("#confirmation_dialog").modal("hide");
callback();
});
confirmationDialog.modal("show");
} else {
callback();
}
if (data === undefined)
return;
$.ajax({
url: API_BASEURL + "printer/command",
type: "POST",
dataType: "json",
contentType: "application/json; charset=UTF-8",
data: JSON.stringify(data)
})
};
self.displayMode = function(customControl) {