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