merge master

This commit is contained in:
Nick O'Leary
2018-05-14 09:14:35 +01:00
5 changed files with 34 additions and 9 deletions

View File

@@ -395,6 +395,7 @@ function getAllNodeConfigs(lang) {
var id = nodeList[i];
var config = moduleConfigs[getModule(id)].nodes[getNode(id)];
if (config.enabled && !config.err) {
result += "\n<!-- --- [red-module:"+id+"] --- -->\n";
result += config.config;
result += loader.getNodeHelp(config,lang||"en-US")||"";
//script += config.script;
@@ -417,7 +418,7 @@ function getNodeConfig(id,lang) {
}
config = config.nodes[getNode(id)];
if (config) {
var result = config.config;
var result = "<!-- --- [red-module:"+id+"] --- -->\n"+config.config;
result += loader.getNodeHelp(config,lang||"en-US")
//if (config.script) {