@node-red/editor-client 1.3.3 → 1.3.7

package/public/red/red.js

@@ -3399,6 +3399,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++) {
@@ -3676,6 +3680,7 @@ RED.nodes = (function() {
                                 } else {
                                     var users = configNode.users;
                                     users.splice(users.indexOf(node),1);
+                                    RED.events.emit('nodes:change',configNode)
                                 }
                             }
                         }
@@ -4737,6 +4742,8 @@ RED.nodes = (function() {
                     nid = getID();
                     workspace_map[n.id] = nid;
                     n.id = nid;
+                } else {
+                    workspace_map[n.id] = n.id;
                 }
                 addWorkspace(n);
                 RED.workspaces.add(n);
@@ -4836,7 +4843,7 @@ RED.nodes = (function() {
                         }
                     }
                 } else {
-                    if (n.z && !workspaces[n.z] && !subflow_map[n.z]) {
+                    if (n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
                         n.z = activeWorkspace;
                     }
                 }
@@ -4934,7 +4941,7 @@ RED.nodes = (function() {
                         node.id = getID();
                     } else {
                         node.id = n.id;
-                        if (node.z == null || (!workspaces[node.z] && !subflow_map[node.z])) {
+                        if (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z])) {
                             if (createMissingWorkspace) {
                                 if (missingWorkspace === null) {
                                     missingWorkspace = RED.workspaces.add(null,true);
@@ -5339,6 +5346,7 @@ RED.nodes = (function() {
                         if (configNode) {
                             if (configNode.users.indexOf(n) === -1) {
                                 configNode.users.push(n);
+                                RED.events.emit('nodes:change',configNode)
                             }
                         }
                     }
@@ -6496,12 +6504,14 @@ RED.history = (function() {
                     var importedResult = RED.nodes.import(ev.config,{importMap: importMap})
                     inverseEv = {
                         t: 'replace',
-                        config: importedResult.removedNodes
+                        config: importedResult.removedNodes,
+                        dirty: RED.nodes.dirty()
                     }
                 }
             } else if (ev.t == 'add') {
                 inverseEv = {
                     t: "delete",
+                    dirty: RED.nodes.dirty()
                 };
                 if (ev.nodes) {
                     inverseEv.nodes = [];
@@ -6588,7 +6598,8 @@ RED.history = (function() {
 
             } else if (ev.t == "delete") {
                 inverseEv = {
-                    t: "add"
+                    t: "add",
+                    dirty: RED.nodes.dirty()
                 };
                 if (ev.workspaces) {
                     inverseEv.workspaces = [];
@@ -6730,11 +6741,12 @@ RED.history = (function() {
             } else if (ev.t == "move") {
                 inverseEv = {
                     t: 'move',
-                    nodes: []
+                    nodes: [],
+                    dirty: RED.nodes.dirty()
                 };
                 for (i=0;i<ev.nodes.length;i++) {
                     var n = ev.nodes[i];
-                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
+                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.n.moved};
                     inverseEv.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
@@ -6766,7 +6778,9 @@ RED.history = (function() {
             } else if (ev.t == "edit") {
                 inverseEv = {
                     t: "edit",
-                    changes: {}
+                    changes: {},
+                    changed: ev.node.changed,
+                    dirty: RED.nodes.dirty()
                 };
                 inverseEv.node = ev.node;
                 for (i in ev.changes) {
@@ -6982,7 +6996,8 @@ RED.history = (function() {
             } else if (ev.t == "reorder") {
                 inverseEv = {
                     t: 'reorder',
-                    order: RED.nodes.getWorkspaceOrder()
+                    order: RED.nodes.getWorkspaceOrder(),
+                    dirty: RED.nodes.dirty()
                 };
                 if (ev.order) {
                     RED.workspaces.order(ev.order);
@@ -8001,6 +8016,7 @@ RED.utils = (function() {
             obj[key] = value;
         }
     }
+
     function separateIconPath(icon) {
         var result = {module: "", file: ""};
         if (icon) {
@@ -8008,10 +8024,10 @@ RED.utils = (function() {
             if (index === 0) {
                 icon = icon.substring((RED.settings.apiRootUrl+'icons/').length);
             }
-            index = icon.indexOf('/');
-            if (index !== -1) {
-                result.module = icon.slice(0, index);
-                result.file = icon.slice(index + 1);
+            var match = /^((?:@[^/]+\/)?[^/]+)\/(.*)$/.exec(icon);
+            if (match) {
+                result.module = match[1];
+                result.file = match[2];
             } else {
                 result.file = icon;
             }
@@ -8020,6 +8036,7 @@ RED.utils = (function() {
     }
 
     function getDefaultNodeIcon(def,node) {
+        def = def || {};
         var icon_url;
         if (node && node.type === "subflow") {
             icon_url = "node-red/subflow.svg";
@@ -8057,6 +8074,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') {
@@ -8144,6 +8162,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) {
@@ -8270,9 +8289,9 @@ RED.utils = (function() {
         imageIconElement.css("backgroundImage", "url("+iconUrl+")");
     }
 
-    function createNodeIcon(node) {
+    function createNodeIcon(node, includeLabel) {
         var def = node._def;
-        var nodeDiv = $('<div>',{class:"red-ui-search-result-node"})
+        var nodeDiv = $('<div>',{class:"red-ui-node-icon"})
         if (node.type === "_selection_") {
             nodeDiv.addClass("red-ui-palette-icon-selection");
         } else if (node.type === "group") {
@@ -8292,8 +8311,20 @@ RED.utils = (function() {
         }
 
         var icon_url = RED.utils.getNodeIcon(def,node);
-        var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
-        RED.utils.createIconElement(icon_url, iconContainer, true);
+        RED.utils.createIconElement(icon_url, nodeDiv, true);
+
+        if (includeLabel) {
+            var container = $('<span>');
+            nodeDiv.appendTo(container);
+            var labelText = RED.utils.getNodeLabel(node,node.name || (node.type+": "+node.id));
+            var label = $('<div>',{class:"red-ui-node-label"}).appendTo(container);
+            if (labelText) {
+                label.text(labelText)
+            } else {
+                label.html("&nbsp;")
+            }
+            return container;
+        }
         return nodeDiv;
     }
 
@@ -9136,6 +9167,7 @@ RED.utils = (function() {
             }
             if (child.depth !== parent.depth+1) {
                 child.depth = parent.depth+1;
+                // var labelPaddingWidth = ((child.gutter ? child.gutter[0].offsetWidth + 2 : 0) + (child.depth * 20));
                 var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20));
                 child.treeList.labelPadding.width(labelPaddingWidth+'px');
                 if (child.element) {
@@ -9172,6 +9204,18 @@ RED.utils = (function() {
                 that._selected.delete(item);
                 delete item.treeList;
                 delete that._items[item.id];
+                if(item.depth === 0) {
+                    for(var key in that._items) {
+                        if (that._items.hasOwnProperty(key)) {
+                            var child = that._items[key];
+                            if(child.parent && child.parent.id === item.id) {
+                                delete that._items[key].treeList;
+                                delete that._items[key];
+                            }
+                        }
+                    }
+                    that._data = that._data.filter(function(data) { return data.id !== item.id})
+                }
             }
             item.treeList.insertChildAt = function(newItem,position,select) {
                 newItem.parent = item;
@@ -9304,7 +9348,10 @@ RED.utils = (function() {
                     if (item.treeList.container) {
                         $(item.element).remove();
                         $(element).appendTo(item.treeList.label);
-                        var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(item.depth*20);
+                        // using the JQuery Object, the gutter width will
+                        // be wrong when the element is reattached the second time
+                        var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (item.depth * 20);
+
                         $(element).css({
                             width: "calc(100% - "+(labelPaddingWidth+20+(item.icon?20:0))+"px)"
                         })
@@ -9341,6 +9388,7 @@ RED.utils = (function() {
 
             }
             var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20);
+            // var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (depth * 20)
             item.treeList.labelPadding = $('<span>').css({
                 display: "inline-block",
                 width:  labelPaddingWidth+'px'
@@ -10956,7 +11004,22 @@ RED.tabs = (function() {
         if (options.scrollable) {
             wrapper.addClass("red-ui-tabs-scrollable");
             scrollContainer.addClass("red-ui-tabs-scroll-container");
-            scrollContainer.on("scroll",updateScroll);
+            scrollContainer.on("scroll",function(evt) {
+                // Generated by trackpads - not mousewheel
+                updateScroll(evt);
+            });
+            scrollContainer.on("wheel", function(evt) {
+                if (evt.originalEvent.deltaX === 0) {
+                    // Prevent the scroll event from firing
+                    evt.preventDefault();
+
+                    // Assume this is wheel event which might not trigger
+                    // the scroll event, so do things manually
+                    var sl = scrollContainer.scrollLeft();
+                    sl -= evt.originalEvent.deltaY;
+                    scrollContainer.scrollLeft(sl);
+                }
+            })
             scrollLeft = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-left"><a href="#" style="display:none;"><i class="fa fa-caret-left"></i></a></div>').appendTo(wrapper).find("a");
             scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=150') }).on('click',function(evt){ evt.preventDefault();});
             scrollRight = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-right"><a href="#" style="display:none;"><i class="fa fa-caret-right"></i></a></div>').appendTo(wrapper).find("a");
@@ -11626,6 +11689,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;
             },
@@ -11882,7 +11948,7 @@ RED.stack = (function() {
  **/
 (function($) {
     var contextParse = function(v,defaultStore) {
-        var parts = RED.utils.parseContextKey(v, defaultStore);
+        var parts = RED.utils.parseContextKey(v, defaultStore&&defaultStore.value);
         return {
             option: parts.store,
             value: parts.key
@@ -12146,6 +12212,14 @@ RED.stack = (function() {
                 var contextStores = RED.settings.context.stores;
                 var contextOptions = contextStores.map(function(store) {
                     return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database"></i>'}
+                }).sort(function(A,B) {
+                    if (A.value === RED.settings.context.default) {
+                        return -1;
+                    } else if (B.value === RED.settings.context.default) {
+                        return 1;
+                    } else {
+                        return A.value.localeCompare(B.value);
+                    }
                 })
                 if (contextOptions.length < 2) {
                     allOptions.flow.options = [];
@@ -12256,6 +12330,11 @@ RED.stack = (function() {
                 evt.stopPropagation();
             }).on('focus', function() {
                 that.uiSelect.addClass('red-ui-typedInput-focus');
+            }).on('blur', function() {
+                var opt = that.typeMap[that.propertyType];
+                if (opt.hasValue === false) {
+                    that.uiSelect.removeClass('red-ui-typedInput-focus');
+                }
             })
 
             // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
@@ -12305,7 +12384,11 @@ RED.stack = (function() {
                 });
 
                 this._showMenu(this.optionMenu,this.optionSelectTrigger);
-                var selectedOption = this.optionMenu.find("[value='"+this.optionValue+"']");
+                var targetValue = this.optionValue;
+                if (this.optionValue === null || this.optionValue === undefined) {
+                    targetValue = this.value();
+                }
+                var selectedOption = this.optionMenu.find("[value='"+targetValue+"']");
                 if (selectedOption.length === 0) {
                     selectedOption = this.optionMenu.children(":first");
                 }
@@ -17197,7 +17280,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;
                 }
@@ -18754,15 +18841,15 @@ RED.view = (function() {
                             var mouseY = node.n.y;
                             if (outer[0][0].getIntersectionList) {
                                 var svgRect = outer[0][0].createSVGRect();
-                                svgRect.x = mouseX;
-                                svgRect.y = mouseY;
+                                svgRect.x = mouseX*scaleFactor;
+                                svgRect.y = mouseY*scaleFactor;
                                 svgRect.width = 1;
                                 svgRect.height = 1;
                                 nodes = outer[0][0].getIntersectionList(svgRect, outer[0][0]);
                             } else {
                                 // Firefox doesn"t do getIntersectionList and that
                                 // makes us sad
-                                nodes = RED.view.getLinksAtPoint(mouseX,mouseY);
+                                nodes = RED.view.getLinksAtPoint(mouseX*scaleFactor,mouseY*scaleFactor);
                             }
                             for (var i=0;i<nodes.length;i++) {
                                 if (d3.select(nodes[i]).classed("red-ui-flow-link-background")) {
@@ -19029,7 +19116,6 @@ RED.view = (function() {
             }
         }
         if (mouse_mode == RED.state.IMPORT_DRAGGING) {
-            RED.keyboard.remove("escape");
             updateActiveNodes();
             RED.nodes.dirty(true);
         }
@@ -19064,6 +19150,9 @@ RED.view = (function() {
     }
 
     function selectNone() {
+        if (mouse_mode === RED.state.MOVING || mouse_mode === RED.state.MOVING_ACTIVE) {
+            return;
+        }
         if (mouse_mode === RED.state.IMPORT_DRAGGING) {
             clearSelection();
             RED.history.pop();
@@ -19611,6 +19700,7 @@ RED.view = (function() {
     var textDimensionPlaceholder = {};
     var textDimensionCache = {};
     function calculateTextDimensions(str,className) {
+        var cacheKey = "!"+str;
         if (!textDimensionPlaceholder[className]) {
             textDimensionPlaceholder[className] = document.createElement("span");
             textDimensionPlaceholder[className].className = className;
@@ -19619,15 +19709,15 @@ RED.view = (function() {
             document.getElementById("red-ui-editor").appendChild(textDimensionPlaceholder[className]);
             textDimensionCache[className] = {};
         } else {
-            if (textDimensionCache[className][str]) {
-                return textDimensionCache[className][str]
+            if (textDimensionCache[className][cacheKey]) {
+                return textDimensionCache[className][cacheKey]
             }
         }
         textDimensionPlaceholder[className].textContent = (str||"");
         var w = textDimensionPlaceholder[className].offsetWidth;
         var h = textDimensionPlaceholder[className].offsetHeight;
-        textDimensionCache[className][str] = [w,h];
-        return textDimensionCache[className][str];
+        textDimensionCache[className][cacheKey] = [w,h];
+        return textDimensionCache[className][cacheKey];
     }
 
     function convertLineBreakCharacter(str) {
@@ -20721,6 +20811,7 @@ RED.view = (function() {
         }
     }
     function getGroupAt(x,y) {
+        // x,y expected to be in node-co-ordinate space
         var candidateGroups = {};
         for (var i=0;i<activeGroups.length;i++) {
             var g = activeGroups[i];
@@ -22357,6 +22448,9 @@ RED.view = (function() {
             return scaleFactor;
         },
         getLinksAtPoint: function(x,y) {
+            // x,y must be in SVG co-ordinate space
+            // if they come from a node.x/y, they will need to be scaled using
+            // scaleFactor first.
             var result = [];
             var links = outer.selectAll(".red-ui-flow-link-background")[0];
             for (var i=0;i<links.length;i++) {
@@ -23373,7 +23467,7 @@ RED.sidebar = (function() {
             id = RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0]
         }
         if (id) {
-            if (!containsTab(id)) {
+            if (!containsTab(id) && knownTabs[id]) {
                 sidebar_tabs.addTab(knownTabs[id]);
             }
             sidebar_tabs.activateTab(id);
@@ -23770,12 +23864,12 @@ RED.palette = (function() {
                     var paletteNode = getPaletteNode(nt);
                     ui.originalPosition.left = paletteNode.offset().left;
                     mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
-                    mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop();
+                    mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop() + 10;
                     if (!groupTimer) {
                         groupTimer = setTimeout(function() {
-                            mouseX /= RED.view.scale();
-                            mouseY /= RED.view.scale();
-                            var group = RED.view.getGroupAtPoint(mouseX,mouseY);
+                            var mx = mouseX / RED.view.scale();
+                            var my = mouseY / RED.view.scale();
+                            var group = RED.view.getGroupAtPoint(mx,my);
                             if (group !== hoverGroup) {
                                 if (hoverGroup) {
                                     document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
@@ -23807,23 +23901,20 @@ RED.palette = (function() {
                                     svgRect.width = 1;
                                     svgRect.height = 1;
                                     nodes = chartSVG.getIntersectionList(svgRect,chartSVG);
-                                    mouseX /= RED.view.scale();
-                                    mouseY /= RED.view.scale();
                                 } else {
                                     // Firefox doesn't do getIntersectionList and that
                                     // makes us sad
-                                    mouseX /= RED.view.scale();
-                                    mouseY /= RED.view.scale();
                                     nodes = RED.view.getLinksAtPoint(mouseX,mouseY);
                                 }
-
+                                var mx = mouseX / RED.view.scale();
+                                var my = mouseY / RED.view.scale();
                                 for (var i=0;i<nodes.length;i++) {
                                     var node = d3.select(nodes[i]);
                                     if (node.classed('red-ui-flow-link-background') && !node.classed('red-ui-flow-link-link')) {
                                         var length = nodes[i].getTotalLength();
                                         for (var j=0;j<length;j+=10) {
                                             var p = nodes[i].getPointAtLength(j);
-                                            var d2 = ((p.x-mouseX)*(p.x-mouseX))+((p.y-mouseY)*(p.y-mouseY));
+                                            var d2 = ((p.x-mx)*(p.x-mx))+((p.y-my)*(p.y-my));
                                             if (d2 < 200 && d2 < bestDistance) {
                                                 bestDistance = d2;
                                                 bestLink = nodes[i];
@@ -24628,7 +24719,7 @@ RED.sidebar.info = (function() {
                     return;
                 }
             }
-            while ((m=/(\[(.*?)\])/.exec(tip))) {
+            while ((m=/(\[([a-z]*?)\])/.exec(tip))) {
                 tip = tip.replace(m[1],RED.keyboard.formatKey(m[2]));
             }
             tipBox.html(tip).fadeIn(200);
@@ -24808,36 +24899,11 @@ RED.sidebar.info = (function() {
         return item;
     }
 
-    function getNodeLabelText(n) {
-        var label = n.name || n.type+": "+n.id;
-        if (n._def.label) {
-            try {
-                label = (typeof n._def.label === "function" ? n._def.label.call(n) : n._def.label)||"";
-            } catch(err) {
-                console.log("Definition error: "+n.type+".label",err);
-            }
-        }
-        var newlineIndex = label.indexOf("\\n");
-        if (newlineIndex > -1) {
-            label = label.substring(0,newlineIndex)+"...";
-        }
-        return label;
-    }
-
     function getNodeLabel(n) {
-        var div = $('<div>',{class:"red-ui-info-outline-item"});
-        RED.utils.createNodeIcon(n).appendTo(div);
-        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
-        var labelText = getNodeLabelText(n);
-        var label = $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).appendTo(contentDiv);
-        if (labelText) {
-            label.text(labelText)
-        } else {
-            label.html("&nbsp;")
-        }
-
+        var div = $('<div>',{class:"red-ui-node-list-item red-ui-info-outline-item"});
+        RED.utils.createNodeIcon(n, true).appendTo(div);
+        div.find(".red-ui-node-label").addClass("red-ui-info-outline-item-label")
         addControls(n, div);
-
         return div;
     }
 
@@ -25165,7 +25231,7 @@ RED.sidebar.info = (function() {
         var existingObject = objects[n.id];
         var parent = n.g||n.z||"__global__";
 
-        var nodeLabelText = getNodeLabelText(n);
+        var nodeLabelText = RED.utils.getNodeLabel(n,n.name || (n.type+": "+n.id));
         if (nodeLabelText) {
             existingObject.element.find(".red-ui-info-outline-item-label").text(nodeLabelText);
         } else {
@@ -25634,10 +25700,9 @@ RED.sidebar.help = (function() {
     }
 
     function getNodeLabel(n) {
-        var div = $('<div>',{class:"red-ui-info-outline-item"});
+        var div = $('<div>',{class:"red-ui-node-list-item"});
         RED.utils.createNodeIcon(n).appendTo(div);
-        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
-        $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).text(n.name||n.type).appendTo(contentDiv);
+        $('<div>',{class:"red-ui-node-label"}).text(n.name||n.type).appendTo(div);
         return div;
     }
 
@@ -33074,7 +33139,7 @@ RED.clipboard = (function() {
 
         var libraries = RED.settings.libraries || [];
         libraries.forEach(function(lib) {
-            var tabId = "red-ui-clipboard-dialog-import-tab-library-"+lib.id
+            var tabId = "red-ui-clipboard-dialog-import-tab-"+lib.id
             tabs.addTab({
                 id: tabId,
                 label: RED._(lib.label||lib.id)
@@ -33808,22 +33873,6 @@ RED.clipboard = (function() {
         }
     }
 
-    function getNodeLabelText(n) {
-        var label = n.name || n.type+": "+n.id;
-        if (n._def.label) {
-            try {
-                label = (typeof n._def.label === "function" ? n._def.label.call(n) : n._def.label)||"";
-            } catch(err) {
-                console.log("Definition error: "+n.type+".label",err);
-            }
-        }
-        var newlineIndex = label.indexOf("\\n");
-        if (newlineIndex > -1) {
-            label = label.substring(0,newlineIndex)+"...";
-        }
-        return label;
-    }
-
     function getFlowLabel(n) {
         n = JSON.parse(JSON.stringify(n));
         n._def = RED.nodes.getType(n.type) || {};
@@ -33849,16 +33898,8 @@ RED.clipboard = (function() {
         if (n._def) {
             n._ = n._def._;
         }
-        var div = $('<div>',{class:"red-ui-info-outline-item"});
-        RED.utils.createNodeIcon(n).appendTo(div);
-        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
-        var labelText = getNodeLabelText(n);
-        var label = $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).appendTo(contentDiv);
-        if (labelText) {
-            label.text(labelText)
-        } else {
-            label.html(n.type)
-        }
+        var div = $('<div>',{class:"red-ui-node-list-item"});
+        RED.utils.createNodeIcon(n,true).appendTo(div);
         return div;
     }
 
@@ -33906,22 +33947,27 @@ RED.clipboard = (function() {
                 hideDropTarget();
             })
             .on("drop",function(event) {
-                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
-                    var data = event.originalEvent.dataTransfer.getData("text/plain");
-                    data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
-                    importNodes(data);
-                } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
-                    var files = event.originalEvent.dataTransfer.files;
-                    if (files.length === 1) {
-                        var file = files[0];
-                        var reader = new FileReader();
-                        reader.onload = (function(theFile) {
-                            return function(e) {
-                                importNodes(e.target.result);
-                            };
-                        })(file);
-                        reader.readAsText(file);
+                try {
+                    if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
+                        var data = event.originalEvent.dataTransfer.getData("text/plain");
+                        data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
+                        importNodes(data);
+                    } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                        var files = event.originalEvent.dataTransfer.files;
+                        if (files.length === 1) {
+                            var file = files[0];
+                            var reader = new FileReader();
+                            reader.onload = (function(theFile) {
+                                return function(e) {
+                                    importNodes(e.target.result);
+                                };
+                            })(file);
+                            reader.readAsText(file);
+                        }
                     }
+                } catch(err) {
+                    // Ensure any errors throw above doesn't stop the drop target from
+                    // being hidden.
                 }
                 hideDropTarget();
                 event.preventDefault();