frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.17

Browse Source
This commit is contained in:
Nick O'Leary
2017-06-26 10:18:42 +01:00
parent 61339face6 9cd751e977
commit df9e50445e
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/js/nodes.js
View File

@@ -533,10 +533,10 @@ RED.nodes = (function() {
/**
* Converts the current node selection to an exportable JSON Object
**/
function createExportableNodeSet(set) {
function createExportableNodeSet(set, exportedSubflows, exportedConfigNodes) {
var nns = [];
var exportedConfigNodes = {};
var exportedSubflows = {};
exportedConfigNodes = exportedConfigNodes || {};
exportedSubflows = exportedSubflows || {};
for (var n=0;n<set.length;n++) {
var node = set[n];
if (node.type.substring(0,8) == "subflow:") {
@@ -550,7 +550,7 @@ RED.nodes = (function() {
subflowSet.push(n);
}
});
var exportableSubflow = createExportableNodeSet(subflowSet);
var exportableSubflow = createExportableNodeSet(subflowSet, exportedSubflows, exportedConfigNodes);
nns = exportableSubflow.concat(nns);
}
}