frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Changed cleanNodeList to cleanModuleList

Browse Source
This commit is contained in:
Anna Thomas 2014-11-26 16:41:31 +00:00
parent bb6e27f662
commit 8f2a0b63d9
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
red/nodes/index.js
View File

@ -129,7 +129,7 @@ module.exports = {
getNodeConfig: registry.getNodeConfig, getNodeConfig: registry.getNodeConfig,
clearRegistry: registry.clear, clearRegistry: registry.clear,
cleanNodeList: registry.cleanNodeList, cleanModuleList: registry.cleanModuleList,
// Flow handling // Flow handling
loadFlows: flows.load, loadFlows: flows.load,

13
red/nodes/registry.js
View File

@ -372,13 +372,18 @@ var registry = (function() {
saveNodeList: saveNodeList, saveNodeList: saveNodeList,
cleanNodeList: function() { cleanModuleList: function() {
var removed = false; var removed = false;
for (var mod in moduleConfigs) { for (var mod in moduleConfigs) {
if (moduleConfigs.hasOwnProperty(mod)) { if (moduleConfigs.hasOwnProperty(mod)) {
if (moduleConfigs[mod] && !moduleNodes[mod]) { if (moduleConfigs[mod] && !moduleNodes[mod]) {
registry.removeNode(id); var nodes = moduleConfigs[mod].nodes;
removed = true; for (var node in nodes) {
if (nodes.hasOwnProperty(node)) {
registry.removeNode(mod+"/"+node);
removed = true;
}
}
} }
} }
} }
@ -775,5 +780,5 @@ module.exports = {
addModule: addModule, addModule: addModule,
removeModule: registry.removeModule, removeModule: registry.removeModule,
cleanNodeList: registry.cleanNodeList cleanModuleList: registry.cleanModuleList
}; };

2
red/server.js
View File

@ -91,7 +91,7 @@ function start() {
} }
if (!settings.autoInstallModules) { if (!settings.autoInstallModules) {
util.log("[red] Removing modules from config"); util.log("[red] Removing modules from config");
redNodes.cleanNodeList(); redNodes.cleanModuleList();
} }
} }
defer.resolve(); defer.resolve();