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

Added showConfirmationDialog function

Browse source
This commit is contained in:
Marc 2015-04-18 11:52:36 +02:00
parent 232dbe5459
commit 525709eb38
3 changed files with 526 additions and 528 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/octoprint/static/js/app/helpers.js
View file

@ -431,3 +431,17 @@ function showOfflineOverlay(title, message, reconnectCallback) {
function hideOfflineOverlay() {
$("#offline_overlay").hide();
}
function showConfirmationDialog(message, onacknowledge) {
var confirmationDialog = $("#confirmation_dialog");
var confirmationDialogAck = $(".confirmation_dialog_acknowledge", confirmationDialog);
$(".confirmation_dialog_message", confirmationDialog).text(message);
confirmationDialogAck.unbind("click");
confirmationDialogAck.bind("click", function (e) {
e.preventDefault();
$("#confirmation_dialog").modal("hide");
onacknowledge(e);
});
confirmationDialog.modal("show");
}

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

File diff suppressed because it is too large Load diff

12
src/octoprint/static/js/app/viewmodels/navigation.js
View file

@ -35,17 +35,9 @@ $(function() {
})
};
if (action.confirm) {
var confirmationDialog = $("#confirmation_dialog");
var confirmationDialogAck = $(".confirmation_dialog_acknowledge", confirmationDialog);
$(".confirmation_dialog_message", confirmationDialog).text(action.confirm);
confirmationDialogAck.unbind("click");
confirmationDialogAck.bind("click", function(e) {
e.preventDefault();
$("#confirmation_dialog").modal("hide");
callback();
showConfirmationDialog(action.confirm, function (e) {
callback();
});
confirmationDialog.modal("show");
} else {
callback();
}