Merge pull request #223 from LazeMSS/develop

0.1.8.1 release
LazeMSS · Jan 3, 2022 · 9102413 · 9102413
2 parents 8472c02 + 4165d7d
commit 9102413
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/octoprint_uicustomizer/static/js/uicustomizer.js b/octoprint_uicustomizer/static/js/uicustomizer.js
@@ -469,7 +469,7 @@ $(function() {
             }
 
             // Check for any issues with installed plugins
-            var genericPluginsWarning = ['widescreen','taborder','statefulsidebar','fullscreen','themeify','octoflat'];
+            var genericPluginsWarning = ['widescreen','taborder','statefulsidebar','fullscreen','themeify','octoflat','webcam_iframe'];
             $.each(genericPluginsWarning,function(key,plugKeyName){
                 if (IgnoredConflictPlugins.hasOwnProperty(plugKeyName) && IgnoredConflictPlugins[plugKeyName] == true){
                     self.logToConsole("Plugin issues for " + plugKeyName + " ignored.");
@@ -867,7 +867,7 @@ $(function() {
                 }else{
                     // Find the column index in the reversed order and mark them for deletion - we can just delete empty ones because we can have an empty filler
                     var keyRevFix = Math.abs(2-key)+1;
-                    $('div.UICCol'+keyRevFix).addClass('UICColDELETEME');
+                    $('div.UICCol'+keyRevFix).addClass('UICColHIDEME');
                 }
             });
             cols.reverse();
@@ -917,8 +917,8 @@ $(function() {
                 });
             });
 
-            // Remove marked for delition
-            $('div.UICColDELETEME').remove();
+            // Hide empty
+            $('div.UICColHIDEME').hide();
         }
 
         // ------------------------------------------------------------------------------------------------------------------------
@@ -3318,7 +3318,6 @@ $(function() {
                 $('#settings_uicustomizer_topicons input[data-settingtype="navbarplugintempfix"]').prop( "disabled", true ).parent().hide();
             }
 
-
             // Top icon sorting
             OctoPrint.coreui.viewmodels.pluginManagerViewModel.plugins.allItems; // init it
             var tiCon = $('#settings_uicustomizer_topicons_container');

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.8.0"
+plugin_version = "0.1.8.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module