Only reload catalogue when requested

node-red · Aug 12, 2016 · b7dbfd5 · b7dbfd5
1 parent cdc7ab5
commit b7dbfd5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/editor/js/ui/palette-editor.js b/editor/js/ui/palette-editor.js
@@ -340,22 +340,24 @@ RED.palette.editor = (function() {
     }
 
     function initInstallTab() {
-        loadedList = [];
-        packageList.editableList('empty');
-        $(".palette-module-shade-status").html("Loading catalogues...");
-        var catalogues = RED.settings.theme('palette.catalogues')||['http://catalogue.nodered.org/catalogue.json'];
-        catalogueLoadStatus = [];
-        catalogueCount = catalogues.length;
-        if (catalogues.length > 1) {
-            $(".palette-module-shade-status").html("Loading catalogues...<br>0/"+catalogues.length);
+        if (loadedList.length === 0) {
+            loadedList = [];
+            packageList.editableList('empty');
+            $(".palette-module-shade-status").html("Loading catalogues...");
+            var catalogues = RED.settings.theme('palette.catalogues')||['http://catalogue.nodered.org/catalogue.json'];
+            catalogueLoadStatus = [];
+            catalogueCount = catalogues.length;
+            if (catalogues.length > 1) {
+                $(".palette-module-shade-status").html("Loading catalogues...<br>0/"+catalogues.length);
+            }
+            $("#palette-module-install-shade").show();
+            catalogueLoadStart = Date.now();
+            catalogues.forEach(function(catalog,index) {
+                $.getJSON(catalog, {_: new Date().getTime()},function(v) {
+                    handleCatalogResponse(catalog,index,v);
+                })
+            });
         }
-        $("#palette-module-install-shade").show();
-        catalogueLoadStart = Date.now();
-        catalogues.forEach(function(catalog,index) {
-            $.getJSON(catalog, {_: new Date().getTime()},function(v) {
-                handleCatalogResponse(catalog,index,v);
-            })
-        });
     }
 
     function refreshFilteredItems() {
@@ -571,6 +573,9 @@ RED.palette.editor = (function() {
                         searchInput.searchBox('count',filteredList.length+" / "+loadedList.length);
                     } else {
                         searchInput.searchBox('count',loadedList.length);
+                        if (searchTerm.length === 0) {
+                            packageList.editableList('empty');
+                        }
                     }
                 }
             });
@@ -608,6 +613,7 @@ RED.palette.editor = (function() {
         var refreshButton = $('<a href="#" class="sidebar-header-button"><i class="fa fa-refresh"></i></a>').appendTo(refreshSpan);
         refreshButton.click(function(e) {
             e.preventDefault();
+            loadedList = [];
             initInstallTab();
         })
 

diff --git a/editor/sass/mixins.scss b/editor/sass/mixins.scss
@@ -83,12 +83,14 @@
     @include workspace-button;
     color: $workspace-button-color-selected;
     background:$workspace-button-background-active;
-
+    transition: all 0.1s ease-in-out;
+    margin-bottom: 1px;
     &.selected:not(.disabled) {
         color: $workspace-button-color;
         background: $workspace-button-background;
         border-bottom-width: 2px;
         border-bottom-color: $form-input-border-selected-color;
+        margin-bottom: 0;
     }
 }