From 7c2786969a76e6df4fcd2d62619d881a94a7c5f2 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 5 Jun 2020 09:54:46 +0100
Subject: [PATCH] Preserve event handlers when moving outliner items

---
 .../editor-client/src/js/ui/common/editableList.js     | 10 +++++++---
 .../editor-client/src/js/ui/common/treeList.js         |  8 ++++----
 .../editor-client/src/js/ui/tab-info-outliner.js       |  7 +++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
index 3df2f9a51..962d87081 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -33,7 +33,7 @@
  * methods:
  *   - addItem(itemData)
  *   - insertItemAt : function(data,index) - add an item at the specified index
- *   - removeItem(itemData)
+ *   - removeItem(itemData, detach) - remove the item. Optionally detach to preserve any event handlers on the item's label
  *   - getItemAt(index)
  *   - indexOf(itemData)
  *   - width(width)
@@ -332,11 +332,15 @@
                 this.addItem(items[i]);
             }
         },
-        removeItem: function(data) {
+        removeItem: function(data,detach) {
             var items = this.element.children().filter(function(f) {
                 return data === $(this).children(".red-ui-editableList-item-content").data('data');
             });
-            items.remove();
+            if (detach) {
+                items.detach();
+            } else {
+                items.remove();
+            }
             if (this.options.removeItem) {
                 this.options.removeItem(data);
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
index d6313422a..f11dab38d 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -65,7 +65,7 @@
  *   item.treeList.container
  *   item.treeList.label - the label element for the item
  *   item.treeList.parentList  - the editableList instance this item is in
- *   item.treeList.remove() - removes the item from the tree
+ *   item.treeList.remove(detach) - removes the item from the tree. Optionally detach to preserve any event handlers on the item's label
  *   item.treeList.makeLeaf(detachChildElements) - turns an element with children into a leaf node,
  *                                                 removing the UI decoration etc.
  *                                                 detachChildElements - any children with custom
@@ -311,9 +311,9 @@
             this._items[item.id] = item;
             item.treeList = {};
             item.depth = depth;
-            item.treeList.remove = function() {
+            item.treeList.remove = function(detach) {
                 if (item.treeList.parentList) {
-                    item.treeList.parentList.editableList('removeItem',item);
+                    item.treeList.parentList.editableList('removeItem',item,detach);
                 }
                 if (item.parent) {
                     var index = item.parent.children.indexOf(item);
@@ -322,7 +322,7 @@
                 }
                 that._selected.delete(item);
                 delete item.treeList;
-                delete(that._items[item.id]);
+                delete that._items[item.id];
             }
             item.treeList.insertChildAt = function(newItem,position,select) {
                 newItem.parent = item;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
index 9fd08ba3f..f9111fba8 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
@@ -365,7 +365,7 @@ RED.sidebar.info.outliner = (function() {
 
     function onNodeChange(n) {
         var existingObject = objects[n.id];
-        var parent = n.g||n.z;
+        var parent = n.g||n.z||"__global__";
 
         var nodeLabelText = getNodeLabelText(n);
         if (nodeLabelText) {
@@ -373,10 +373,9 @@ RED.sidebar.info.outliner = (function() {
         } else {
             existingObject.element.find(".red-ui-info-outline-item-label").html("&nbsp;");
         }
-
         if (parent !== existingObject.parent.id) {
-            existingObject.treeList.remove();
-            if (!parent) {
+            existingObject.treeList.remove(true);
+            if (parent === "__global__") {
                 globalConfigNodes.treeList.addChild(existingObject);
             } else {
                 if (empties[parent]) {