Merge branch 'master' into dev

node-red · May 13, 2021 · fe64c6a · fe64c6a
2 parents 74628b7 + 2bbdc85
commit fe64c6a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -86,6 +86,10 @@ RED.nodes = (function() {
                 }
             },
             addNodeSet: function(ns) {
+                if (!ns.types) {
+                    // A node has been loaded without any types. Ignore it.
+                    return;
+                }
                 ns.added = false;
                 nodeSets[ns.id] = ns;
                 for (var j=0;j<ns.types.length;j++) {

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -785,6 +785,9 @@ RED.tabs = (function() {
             count: function() {
                 return ul.find("li.red-ui-tab").length;
             },
+            activeIndex: function() {
+                return ul.find("li.active").index()    
+            },
             contains: function(id) {
                 return ul.find("a[href='#"+id+"']").length > 0;
             },

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -882,6 +882,7 @@ RED.utils = (function() {
     }
 
     function getDefaultNodeIcon(def,node) {
+        def = def || {};
         var icon_url;
         if (node && node.type === "subflow") {
             icon_url = "node-red/subflow.svg";
@@ -919,6 +920,7 @@ RED.utils = (function() {
     }
 
     function getNodeIcon(def,node) {
+        def = def || {};
         if (node && node.type === '_selection_') {
             return "font-awesome/fa-object-ungroup";
         } else if (node && node.type === 'group') {
@@ -1006,6 +1008,7 @@ RED.utils = (function() {
     }
 
     function getNodeColor(type, def) {
+        def = def || {};
         var result = def.color;
         var paletteTheme = RED.settings.theme('palette.theme') || [];
         if (paletteTheme.length > 0) {

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -493,7 +493,11 @@ RED.workspaces = (function() {
             if (!workspace_tabs.contains(id)) {
                 var sf = RED.nodes.subflow(id);
                 if (sf) {
-                    addWorkspace({type:"subflow",id:id,icon:"red/images/subflow_tab.svg",label:sf.name, closeable: true});
+                    addWorkspace(
+                        {type:"subflow",id:id,icon:"red/images/subflow_tab.svg",label:sf.name, closeable: true},
+                        null,
+                        workspace_tabs.activeIndex()+1
+                    );
                 } else {
                     return;
                 }