frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary 2019-07-01 12:43:16 +01:00
parent 8b3b541a56 f49d1ae860
commit 24b38407e4
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,7 @@ RED.palette = (function() {
function getPaletteNode(type) {
return $(".red-ui-palette-node[data-palette-type='"+type+"']");
}
function addNodeType(nt,def) {
if (getPaletteNode(nt).length) {
return;

2
packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js vendored
View File

@ -291,7 +291,7 @@ class Flow {
if (this.subflowInstanceNodes[stopList[i]]) {
try {
(function(subflow) {
promises.push(stopNode(node,false).then(() => { subflow.stop() }));
promises.push(stopNode(node,false).then(() => subflow.stop()));
})(this.subflowInstanceNodes[stopList[i]]);
} catch(err) {
node.error(err);