frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Preserve event handlers when moving outliner items

Browse Source
This commit is contained in:
Nick O'Leary 2020-06-05 09:54:46 +01:00
parent 565aae5967
commit 7c2786969a
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js vendored
View File

@ -33,7 +33,7 @@
* methods: * methods:
* - addItem(itemData) * - addItem(itemData)
* - insertItemAt : function(data,index) - add an item at the specified index * - 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) * - getItemAt(index)
* - indexOf(itemData) * - indexOf(itemData)
* - width(width) * - width(width)
@ -332,11 +332,15 @@
this.addItem(items[i]); this.addItem(items[i]);
} }
}, },
removeItem: function(data) { removeItem: function(data,detach) {
var items = this.element.children().filter(function(f) { var items = this.element.children().filter(function(f) {
return data === $(this).children(".red-ui-editableList-item-content").data('data'); return data === $(this).children(".red-ui-editableList-item-content").data('data');
}); });
items.remove(); if (detach) {
items.detach();
} else {
items.remove();
}
if (this.options.removeItem) { if (this.options.removeItem) {
this.options.removeItem(data); this.options.removeItem(data);
} }

8
packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js vendored
View File

@ -65,7 +65,7 @@
* item.treeList.container * item.treeList.container
* item.treeList.label - the label element for the item * item.treeList.label - the label element for the item
* item.treeList.parentList - the editableList instance this item is in * 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, * item.treeList.makeLeaf(detachChildElements) - turns an element with children into a leaf node,
* removing the UI decoration etc. * removing the UI decoration etc.
* detachChildElements - any children with custom * detachChildElements - any children with custom
@ -311,9 +311,9 @@
this._items[item.id] = item; this._items[item.id] = item;
item.treeList = {}; item.treeList = {};
item.depth = depth; item.depth = depth;
item.treeList.remove = function() { item.treeList.remove = function(detach) {
if (item.treeList.parentList) { if (item.treeList.parentList) {
item.treeList.parentList.editableList('removeItem',item); item.treeList.parentList.editableList('removeItem',item,detach);
} }
if (item.parent) { if (item.parent) {
var index = item.parent.children.indexOf(item); var index = item.parent.children.indexOf(item);
@ -322,7 +322,7 @@
} }
that._selected.delete(item); that._selected.delete(item);
delete item.treeList; delete item.treeList;
delete(that._items[item.id]); delete that._items[item.id];
} }
item.treeList.insertChildAt = function(newItem,position,select) { item.treeList.insertChildAt = function(newItem,position,select) {
newItem.parent = item; newItem.parent = item;

7
packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js vendored
View File

@ -365,7 +365,7 @@ RED.sidebar.info.outliner = (function() {
function onNodeChange(n) { function onNodeChange(n) {
var existingObject = objects[n.id]; var existingObject = objects[n.id];
var parent = n.g||n.z; var parent = n.g||n.z||"__global__";
var nodeLabelText = getNodeLabelText(n); var nodeLabelText = getNodeLabelText(n);
if (nodeLabelText) { if (nodeLabelText) {
@ -373,10 +373,9 @@ RED.sidebar.info.outliner = (function() {
} else { } else {
existingObject.element.find(".red-ui-info-outline-item-label").html(" "); existingObject.element.find(".red-ui-info-outline-item-label").html(" ");
} }
if (parent !== existingObject.parent.id) { if (parent !== existingObject.parent.id) {
existingObject.treeList.remove(); existingObject.treeList.remove(true);
if (!parent) { if (parent === "__global__") {
globalConfigNodes.treeList.addChild(existingObject); globalConfigNodes.treeList.addChild(existingObject);
} else { } else {
if (empties[parent]) { if (empties[parent]) {