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 dev

Browse Source
This commit is contained in:
Nick O'Leary
2019-11-21 21:57:58 +00:00
parent f478afb58a b81be8f358
commit d45274494d
59 changed files with 779 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,7 +224,7 @@ Node.prototype._emitInput = function(arg) {
}
);
} catch(err) {
node.error(err,msg);
node.error(err,arg);
}
}
}

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

@@ -200,6 +200,9 @@ class Subflow extends Flow {
self.node.status({text:text});
} else if (msg.status !== undefined) {
// if msg.status exists
if (msg.status.hasOwnProperty("text") && msg.status.text.indexOf("common.") === 0) {
msg.status.text = "node-red:"+msg.status.text;
}
self.node.status(msg.status)
}
})
@@ -310,7 +313,6 @@ class Subflow extends Flow {
}
}
}
super.start(diff);
}
@@ -435,7 +437,6 @@ class Subflow extends Flow {
}
return handled;
}
}