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

Merge pull request #1810 from node-red-hitachi/0.19-fix-inject-node-notification-for-persistable-context 

Fix context access appearance of inject node in editor
This commit is contained in:
Nick O'Leary 2018-07-14 22:40:19 +01:00 committed by GitHub
parent 5a0a7b907b b44ecd8819
commit cf87837f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nodes/core/core/20-inject.html
View File

@ -238,12 +238,8 @@ If you want every 20 minutes from now - use the <i>"interval"</i> option.</p>
return this._("inject.timestamp")+suffix; return this._("inject.timestamp")+suffix;
} }
} else if (this.payloadType === 'flow' || this.payloadType === 'global') { } else if (this.payloadType === 'flow' || this.payloadType === 'global') {
var key = this.payload; var key = RED.utils.parseContextKey(this.payload);
var m = /^#:\((\S+?)\)::(.*)$/.exec(key); return this.payloadType+"."+key.key+suffix;
if (m) {
key = m[2];
}
return 'flow.'+key+suffix;
} else { } else {
return this._("inject.inject")+suffix; return this._("inject.inject")+suffix;
} }
@ -505,7 +501,13 @@ If you want every 20 minutes from now - use the <i>"interval"</i> option.</p>
if (this.changed) { if (this.changed) {
return RED.notify(RED._("notification.warning", {message:RED._("notification.warnings.undeployedChanges")}),"warning"); return RED.notify(RED._("notification.warning", {message:RED._("notification.warnings.undeployedChanges")}),"warning");
} }
var label = (this.name||this.payload); var payload = this.payload;
if ((this.payloadType === 'flow') ||
(this.payloadType === 'global')) {
var key = RED.utils.parseContextKey(payload);
payload = this.payloadType+"."+key.key;
}
var label = (this.name||payload);
if (label.length > 30) { if (label.length > 30) {
label = label.substring(0,50)+"..."; label = label.substring(0,50)+"...";
} }