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

Resync with master

Browse Source
This commit is contained in:
Nick O'Leary
2017-03-01 17:45:09 +00:00
parent cdd6b243ff 54ee655472
commit 73501f3ad3
24 changed files with 318 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
red/runtime/nodes/registry/loader.js
View File

@@ -315,6 +315,18 @@ function loadNodeSet(node) {
return loadPromise;
} catch(err) {
node.err = err;
var stack = err.stack;
var message;
if (stack) {
var i = stack.indexOf(node.file);
if (i > -1) {
var excerpt = stack.substring(i+node.file.length+1,i+node.file.length+20);
var m = /^(\d+):(\d+)/.exec(excerpt);
if (m) {
node.err = err+" (line:"+m[1]+")";
}
}
}
return when.resolve(node);
}
}
@@ -381,8 +393,10 @@ function getNodeHelp(node,lang) {
}
if (help) {
node.help[lang] = help;
} else if (lang === runtime.i18n.defaultLang) {
return null;
} else {
node.help[lang] = node.help[runtime.i18n.defaultLang];
node.help[lang] = getNodeHelp(node, runtime.i18n.defaultLang);
}
}
return node.help[lang];