Merge pull request #309 from LazeMSS/develop

0.1.9.9 - release
LazeMSS · Nov 12, 2023 · 6c3e383 · 6c3e383
2 parents 0e1886a + 9b06219
commit 6c3e383
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/octoprint_uicustomizer/static/css/uicustomizer.css b/octoprint_uicustomizer/static/css/uicustomizer.css
@@ -1093,6 +1093,11 @@ body.inlineFullscreen .UICWebCamClick{
     cursor: none !important;
 }
 
+/* force hide shrink on fullscreen to prevent double */
+#UICWebCamFull.FullCam > #UICWebCamTarget div.UICWebCamClick{
+    display: none !important;
+}
+
 
 /* webcam progress bar */
 #UICWebCamFullProgress{

diff --git a/octoprint_uicustomizer/static/js/uicustomizer.js b/octoprint_uicustomizer/static/js/uicustomizer.js
@@ -46,7 +46,7 @@ $(function() {
         self.settings = null;
         self.UICsettings = null;
         self.tempModel = parameters[2] ? parameters[2] : parameters[1];
-        self.newCam = (typeof self.coreSettings.webcam_webcams != undefined);
+        self.newCam = (typeof self.coreSettings.webcam_webcams === 'function');
         self.classicCam = parameters[3];
 
         // Ignore these accordions - warnings about safety should always be shown
@@ -3878,6 +3878,7 @@ $(function() {
                 // Gcode widget on and visible
                 if (!$('#UICGcodeVWidgetContainer.collapse.in').length || !$('#gcode_canvas').length || typeof OctoPrint.coreui.viewmodels.gcodeViewModel != "object") return;
 
+                var prevGcodeTab = OctoPrint.coreui.viewmodels.gcodeViewModel.tabActive;
                 OctoPrint.coreui.viewmodels.gcodeViewModel.tabActive = true;
 
                 // load the file is needed
@@ -3886,9 +3887,10 @@ $(function() {
                 }
 
                 // Update if gcode
-                if (data.progress.completion != null){
+                if (data.progress.completion != null && OctoPrint.coreui.selectedTab != "#gcode"){
                     OctoPrint.coreui.viewmodels.gcodeViewModel._renderPercentage(data.progress.completion);
                 }
+                OctoPrint.coreui.viewmodels.gcodeViewModel.tabActive = prevGcodeTab;
 
                 self.cloneGcodeWidget();
             }

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "UI Customizer"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.9.8"
+plugin_version = "0.1.9.9"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module