kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Add async callback to module when loaded

Browse Source
This commit is contained in:
Chris van Marle
2016-12-07 17:19:05 +01:00
parent 98855de71f
commit 3947deb7bd
3 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
js/app.js
View File

@@ -66,7 +66,7 @@ var App = function() {
*
* argument module string - The name of the module (including subpath).
*/
var loadModule = function(module) {
var loadModule = function(module, callback) {
var elements = module.split("/");
var moduleName = elements[elements.length - 1];
@@ -103,6 +103,10 @@ var App = function() {
m.setName(moduleName);
m.setPath(path.resolve(moduleFolder));
nodeHelpers.push(m);
m.loaded(callback);
} else {
callback();
}
};
@@ -111,14 +115,24 @@ var App = function() {
*
* argument module string - The name of the module (including subpath).
*/
var loadModules = function(modules) {
var loadModules = function(modules, callback) {
console.log("Loading module helpers ...");
for (var m in modules) {
loadModule(modules[m]);
}
var loadNextModule = function() {
if (modules.length > 0) {
var nextModule = modules[0];
loadModule(nextModule, function() {
modules = modules.slice(1);
loadNextModule();
});
} else {
// All modules are loaded
console.log("All module helpers loaded.");
callback();
}
};
console.log("All module helpers loaded.");
loadNextModule();
};
/* cmpVersions(a,b)
@@ -164,24 +178,24 @@ var App = function() {
}
}
loadModules(modules);
loadModules(modules, function() {
var server = new Server(config, function(app, io) {
console.log("Server started ...");
var server = new Server(config, function(app, io) {
console.log("Server started ...");
for (var h in nodeHelpers) {
var nodeHelper = nodeHelpers[h];
nodeHelper.setExpressApp(app);
nodeHelper.setSocketIO(io);
nodeHelper.start();
}
for (var h in nodeHelpers) {
var nodeHelper = nodeHelpers[h];
nodeHelper.setExpressApp(app);
nodeHelper.setSocketIO(io);
nodeHelper.start();
}
console.log("Sockets connected & modules started ...");
console.log("Sockets connected & modules started ...");
if (typeof callback === "function") {
callback(config);
}
if (typeof callback === "function") {
callback(config);
}
});
});
});
};