mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Merge 34339615d9af4e5d5c2d755d162d66baa255b1ab into 1b375b81f36b300b076cdcc042eda62cbcb00a67
This commit is contained in:
commit
9570935765
File diff suppressed because it is too large
Load Diff
@ -508,10 +508,8 @@ RED.subflow = (function() {
|
||||
var activeSubflow = RED.nodes.subflow(id);
|
||||
|
||||
RED.nodes.eachNode(function(n) {
|
||||
if (!keepInstanceNodes && n.type == "subflow:"+id) {
|
||||
removedNodes.push(n);
|
||||
}
|
||||
if (n.z == id) {
|
||||
if (n.z === id || !keepInstanceNodes && n.type === "subflow:" + id) {
|
||||
RED.nodes.updateConfigNodeUsers(n, { emitEvent: false, action: "remove" });
|
||||
removedNodes.push(n);
|
||||
}
|
||||
});
|
||||
|
@ -5651,12 +5651,9 @@ RED.view = (function() {
|
||||
* default names
|
||||
*/
|
||||
function importNodes(newNodesObj,options) {
|
||||
options = options || {
|
||||
addFlow: false,
|
||||
touchImport: false,
|
||||
generateIds: false,
|
||||
generateDefaultNames: false
|
||||
}
|
||||
const defaultOptions = { generateIds: false, addFlow: false, touchImport: false, generateDefaultNames: false, importMap: {} };
|
||||
options = Object.assign({}, defaultOptions, options);
|
||||
|
||||
var addNewFlow = options.addFlow
|
||||
var touchImport = options.touchImport;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user