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

bugfix. shows safety popup when enabling the laser in the terminal.

Browse source
This commit is contained in:
Teja 2015-03-18 19:12:52 +01:00
parent e482e9523a
commit 0b743b24f9
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
View file

@ -384,7 +384,7 @@
<pre id="terminal-output" class="pre-scrollable"></pre>
<div class="input-append" style="display: none;" data-bind="visible: loginState.isUser">
<input type="text" id="terminal-command" style="width:88%;" data-bind="value: command, event: { keyup: function(d,e) { return handleKeyUp(e); }, keydown: function(d,e) { return handleKeyDown(e); } }, enable: (isOperational() || isLocked()) && loginState.isUser()">
<button class="btn" type="button" id="terminal-send" data-bind="click: sendCommand, enable: (isOperational() || isLocked()) && loginState.isUser()">{{ _('Send') }}</button>
<button class="btn" type="button" id="terminal-send" data-bind="click: sendCommandWithSafetyPopup, enable: (isOperational() || isLocked()) && loginState.isUser()">{{ _('Send') }}</button>
</div>
</div>

31
src/octoprint/static/js/app/viewmodels/terminal.js
View file

@ -91,6 +91,33 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) {
container.scrollTop(container[0].scrollHeight - container.height())
}
};
self.sendCommandWithSafetyPopup = function(){
var command = self.command().split(' ').join('');
if (!command) {
return;
}
console.log(command);
var parts = command.match(/^(M3|M03)(S[0-9.]+)?/i);
if(parts !== null){
$("#confirmation_dialog .confirmation_dialog_message").text(gettext("The laser will now be enabled. Protect yourself and everybody in the room appropriately before proceeding!"));
$("#confirmation_dialog .confirmation_dialog_acknowledge").unbind("click");
$("#confirmation_dialog .confirmation_dialog_acknowledge").click(
function(e) {
e.preventDefault();
$("#confirmation_dialog").modal("hide");
self.sendCommand();
});
$("#confirmation_dialog").modal("show");
} else {
self.sendCommand();
}
};
self.sendCommand = function() {
var command = self.command();
@ -104,7 +131,7 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) {
if (commandMatch != null) {
command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2].toUpperCase() : "");
}
if (command) {
$.ajax({
url: API_BASEURL + "printer/command",
@ -147,7 +174,7 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) {
self.handleKeyUp = function(event) {
if (event.keyCode == 13) {
self.sendCommand();
self.sendCommandWithSafetyPopup();
}
// do not prevent default action