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

focus mode works again

Browse source
This commit is contained in:
Teja 2015-07-06 17:11:32 +02:00
parent f0c5173dd1
commit 6148b82b7f
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -207,26 +207,7 @@ $(function() {
//
//
// self.focus_on = function(){
//
// $("#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.sendCustomCommand({type:'commands', commands:['M8', 'M3S7']});
// setTimeout(function(){ // switch focus off after 30 seconds for safety reasons.
// self.focus_off();
// }, 30000);
// });
// $("#confirmation_dialog").modal("show");
// };
//
// self.focus_off = function(){
//// self.sendCustomCommand({type:'command',command:'M5'});
// self.sendCustomCommand({type:'commands', commands:['M5', 'M9']});
// };
//
// self.sendJogCommand = function(axis, multiplier, distance) {
// if (typeof distance === "undefined")
@ -866,13 +847,34 @@ $(function() {
self.sendCustomCommand({type: 'command', command: "G92 X0 Y0"});
};
self.jogDistanceInMM = ko.observable(undefined)
self.jogDistanceInMM = ko.observable(undefined);
self.focus_on = function () {
$("#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.sendCustomCommand({type: 'commands', commands: ['M8', 'M3S7']});
setTimeout(function () { // switch focus off after 30 seconds for safety reasons.
self.focus_off();
}, 30000);
});
$("#confirmation_dialog").modal("show");
};
self.focus_off = function () {
// self.sendCustomCommand({type:'command',command:'M5'});
self.sendCustomCommand({type: 'commands', commands: ['M5', 'M9']});
};
}
OCTOPRINT_VIEWMODELS.push([
ControlViewModel,
["loginStateViewModel", "settingsViewModel", 'printerStateViewModel'],
"#control"
["#control", '#focus']
]);
});

2
src/octoprint/templates/mrbeam_index.jinja2
View file

@ -427,7 +427,7 @@
</div>
<div id="files_search" class="">
<form class="form-search">
<form class="form-search" data-bind="submit: performSearch">
<input type="text" style="width:90%;" class="input-block search-query" data-bind="value: searchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}">
</form>
</div>