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-05-11 15:10:12 +01:00
parent e79da408a8 48958f392f
commit 7730d0a4f8
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
red/runtime/nodes/Node.js
View File

@@ -65,7 +65,7 @@ Node.prototype.updateWires = function(wires) {
}
Node.prototype.context = function() {
if (!this._context) {
this._context = context.get(this._alias||this.id,this.z);
this._context = context.get(this._alias||this.id,this.z);
}
return this._context;
}

6
red/runtime/nodes/context.js
View File

@@ -47,9 +47,9 @@ function getContext(localId,flowId) {
var newContext = createContext(contextId);
if (flowId) {
newContext.flow = getContext(flowId);
if (globalContext) {
newContext.global = globalContext;
}
}
if (globalContext) {
newContext.global = globalContext;
}
contexts[contextId] = newContext;
return newContext;