From a1d9d2ea7b47f658a86ee86909be7d561f2a6c4b Mon Sep 17 00:00:00 2001
From: make-ing <bckr.florian@gmail.com>
Date: Thu, 17 Mar 2016 09:59:49 +0100
Subject: [PATCH] moved reset override slider functionality to separate method.
 (cherry picked from commit e5c600e)

---
 .../static/js/app/viewmodels/printerstate.js  | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js
index 85e27832..23ee5bf7 100644
--- a/src/octoprint/static/js/app/viewmodels/printerstate.js
+++ b/src/octoprint/static/js/app/viewmodels/printerstate.js
@@ -217,6 +217,7 @@ $(function() {
 			$("#confirmation_dialog .confirmation_dialog_acknowledge").click(
 					function (e) {
 						if (typeof callback === 'function') {
+                            self.onEventPrintDone();
 							callback(e);
 							$("#confirmation_dialog").modal("hide");
 							$("#confirmation_dialog .confirmation_dialog_message").html('');
@@ -286,8 +287,14 @@ $(function() {
 		self.onEventRealTimeState = function(payload){
 			self.currentPos({x: payload.wx, y: payload.wy});
 		};
-		
-		
+
+		self.intensityOverride.subscribe(function(factor){
+			self._overrideCommand("/intensity "+factor);
+		});
+		self.feedrateOverride.subscribe(function(factor){
+			self._overrideCommand("/feedrate "+factor);
+		});
+
 		self._overrideCommand = function(command, callback) {
             $.ajax({
                 url: API_BASEURL + "printer/command",
@@ -302,34 +309,30 @@ $(function() {
                 }
             });
         };
-		
+
 		self._configureOverrideSliders = function() {
 			self.intensityOverrideSlider = $("#intensity_override_slider").slider({
 				step: 1,
 				min: 10,
 				max: 200,
 				value: 100,
-				tooltip: 'hide'
-			}).on("slide", function(ev){
-				self.intensityOverride(ev.value);
+//				tooltip: 'hide'
 			}).on("slideStop", function(ev){
-				self._overrideCommand("/intensity "+self.intensityOverride());
+				self.intensityOverride(ev.value);
 			});
-			
+
 			self.feedrateOverrideSlider = $("#feedrate_override_slider").slider({
 				step: 1,
 				min: 10,
 				max: 200,
 				value: 100,
-				tooltip: 'hide'
-			}).on("slide", function(ev){
-				self.feedrateOverride(ev.value);
+//				tooltip: 'hide'
 			}).on("slideStop", function(ev){
-				self._overrideCommand("/feedrate "+self.feedrateOverride());
+				self.feedrateOverride(ev.value);
 			});
 
 		};
-		
+
 		self.increasePasses = function(){
 			self.numberOfPasses(self.numberOfPasses()+1);
             self._jobCommand("incpasses");
@@ -339,17 +342,21 @@ $(function() {
 			self.numberOfPasses(passes);
             self._jobCommand("degpasses");
 		}
-		
+
 		self.onEventPrintDone = function(){
-			self.feedrateOverrideSlider.slider('setValue', 100);
-			self.intensityOverrideSlider.slider('setValue', 100);
-			self.intensityOverride(100);
-			self.feedrateOverride(100);
+			self.resetOverrideSlider();
 		};
-		
+
 		self.onStartup = function() {
 			self._configureOverrideSliders();
 		};
+
+        self.resetOverrideSlider = function() {
+            self.feedrateOverrideSlider.slider('setValue', 100);
+			self.intensityOverrideSlider.slider('setValue', 100);
+			self.intensityOverride(100);
+			self.feedrateOverride(100);
+        }
     }
 
     OCTOPRINT_VIEWMODELS.push([