🐛 Backwards compatible fix for OctoPrint 1.3.6

BillyBlaze · Dec 5, 2017 · 214dc74 · 214dc74
1 parent 980730c
commit 214dc74
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/octoprint_fullscreen/static/js/fullscreen.js b/octoprint_fullscreen/static/js/fullscreen.js
@@ -29,6 +29,17 @@ $(function() {
 		self.printer.fullscreen = function() {
 			$fullscreenContainer.toggleFullScreen();
 		}
+
+		self.formatBarTemperatureFullscreen = function(toolName, actual, target) {
+			var output = toolName + ": " + _.sprintf("%.1f&deg;C", actual);
+
+			if (target) {
+				var sign = (target >= actual) ? " \u21D7 " : " \u21D8 ";
+				output += sign + _.sprintf("%.1f&deg;C", target);
+			}
+
+			return output;
+		};
 
 		$webcam.on("dblclick", function() {
 			$body.toggleClass('inlineFullscreen');
@@ -59,14 +70,3 @@ $(function() {
 		["#fullscreen-info"]
 	]);
 });
-
-function formatBarTemperatureFullscreen(toolName, actual, target) {
-	var output = toolName + ": " + _.sprintf("%.1f&deg;C", actual);
-
-	if (target) {
-		var sign = (target >= actual) ? " \u21D7 " : " \u21D8 ";
-		output += sign + _.sprintf("%.1f&deg;C", target);
-	}
-
-	return output;
-};
diff --git a/octoprint_fullscreen/templates/fullscreen.jinja2 b/octoprint_fullscreen/templates/fullscreen.jinja2
@@ -4,9 +4,9 @@
 		<div id="fullscreen-info">
 			<div class="temp">
 				<!-- ko foreach: tempModel.tools -->
-				<p data-bind="template: { name: 'tempTemplate' }"></p>
+				<p data-bind="template: { name: 'tempFullscreenTemplate' }"></p>
 				<!-- /ko -->
-				<p data-bind="template: { name: 'tempTemplate', data: tempModel.bedTemp }, visible: tempModel.hasBed"></p>
+				<p data-bind="template: { name: 'tempFullscreenTemplate', data: tempModel.bedTemp }, visible: tempModel.hasBed"></p>
 			</div>
 		</div>
 	<!-- /ko -->
@@ -29,6 +29,6 @@
 
 </div>
 
-<script type="text/html" id="tempTemplate">
-    <span data-bind="html: formatBarTemperatureFullscreen(name(), actual(), target())"></span>
+<script type="text/html" id="tempFullscreenTemplate">
+    <span data-bind="html: $parent.formatBarTemperatureFullscreen(name(), actual(), target())"></span>
 </script>