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

moved reset override slider functionality to separate method.

Browse source
This commit is contained in:
make-ing 2016-03-17 09:59:49 +01:00
parent d7b5fae614
commit e5c600e972
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/octoprint/static/js/app/viewmodels/printerstate.js
View file

@ -216,7 +216,7 @@ $(function() {
$("#confirmation_dialog .confirmation_dialog_acknowledge").click( $("#confirmation_dialog .confirmation_dialog_acknowledge").click(
function (e) { function (e) {
if (typeof callback === 'function') { if (typeof callback === 'function') {
self.onEventPrintDone(); self.resetOverrideSlider();
callback(e); callback(e);
$("#confirmation_dialog").modal("hide"); $("#confirmation_dialog").modal("hide");
$("#confirmation_dialog .confirmation_dialog_message").html(''); $("#confirmation_dialog .confirmation_dialog_message").html('');
@ -333,15 +333,19 @@ $(function() {
}; };
self.onEventPrintDone = function(){ self.onEventPrintDone = function(){
self.feedrateOverrideSlider.slider('setValue', 100); self.resetOverrideSlider();
self.intensityOverrideSlider.slider('setValue', 100);
self.intensityOverride(100);
self.feedrateOverride(100);
}; };
self.onStartup = function() { self.onStartup = function() {
self._configureOverrideSliders(); self._configureOverrideSliders();
}; };
self.resetOverrideSlider = function() {
self.feedrateOverrideSlider.slider('setValue', 100);
self.intensityOverrideSlider.slider('setValue', 100);
self.intensityOverride(100);
self.feedrateOverride(100);
}
} }
OCTOPRINT_VIEWMODELS.push([ OCTOPRINT_VIEWMODELS.push([