From 214dc74513357b3a697c935e29317576ced46384 Mon Sep 17 00:00:00 2001 From: BillyBlaze Date: Tue, 5 Dec 2017 12:20:26 +0000 Subject: [PATCH] :bug: Backwards compatible fix for OctoPrint 1.3.6 --- octoprint_fullscreen/static/js/fullscreen.js | 22 +++++++++---------- .../templates/fullscreen.jinja2 | 8 +++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/octoprint_fullscreen/static/js/fullscreen.js b/octoprint_fullscreen/static/js/fullscreen.js index c93fed0..d1acdf1 100644 --- 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°C", actual); + + if (target) { + var sign = (target >= actual) ? " \u21D7 " : " \u21D8 "; + output += sign + _.sprintf("%.1f°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°C", actual); - - if (target) { - var sign = (target >= actual) ? " \u21D7 " : " \u21D8 "; - output += sign + _.sprintf("%.1f°C", target); - } - - return output; -}; diff --git a/octoprint_fullscreen/templates/fullscreen.jinja2 b/octoprint_fullscreen/templates/fullscreen.jinja2 index 89c0a8d..a70941b 100644 --- a/octoprint_fullscreen/templates/fullscreen.jinja2 +++ b/octoprint_fullscreen/templates/fullscreen.jinja2 @@ -4,9 +4,9 @@
-

+

-

+

@@ -29,6 +29,6 @@ - \ No newline at end of file