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

Fix import of merged flow

Browse Source
This commit is contained in:
Nick O'Leary 2020-10-12 11:20:44 +01:00
parent eb2e1c0c45
commit f46367d77b
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/nodes.js vendored
View File

@ -1842,6 +1842,8 @@ RED.nodes = (function() {
}); });
defaultWorkspace = null; defaultWorkspace = null;
initialLoad = null; initialLoad = null;
workspaces = {};
RED.nodes.dirty(false); RED.nodes.dirty(false);
RED.view.redraw(true, true); RED.view.redraw(true, true);
RED.palette.refresh(); RED.palette.refresh();

2
packages/node_modules/@node-red/editor-client/src/js/ui/diff.js vendored
View File

@ -1411,7 +1411,7 @@ RED.diff = (function() {
// Restore the original flow so subsequent merge resolutions can properly // Restore the original flow so subsequent merge resolutions can properly
// identify new-vs-old // identify new-vs-old
RED.nodes.originalFlow(originalFlow); RED.nodes.originalFlow(originalFlow);
imported[0].forEach(function(n) { imported.nodes.forEach(function(n) {
if (nodeChangedStates[n.id] || localChangedStates[n.id]) { if (nodeChangedStates[n.id] || localChangedStates[n.id]) {
n.changed = true; n.changed = true;
} }