mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-28 17:44:52 -04:00
Squashed commit of the following:
commite38dd346d9
Author: Michael Teeuw <michael@xonaymedia.nl> Date: Sat Apr 2 19:17:30 2016 +0200 Add the possibility to set the maximum number of days. commit6f5c86775b
Author: Sam Vendittelli <sam.vendittelli@hotmail.com> Date: Sat Apr 2 06:27:44 2016 +0100 Fixed cursor appearing in margin Cursor was appearing in the margin so moved `cursor: none` property to html. commit576c668d84
Author: Domi-G <lessuseguy+githubdomig@gmail.com> Date: Fri Apr 1 22:52:32 2016 +0200 Huge cleanup of white space
This commit is contained in:
parent
e2436ad796
commit
5eed80c28e
41 changed files with 152 additions and 184 deletions
23
js/loader.js
23
js/loader.js
|
@ -41,7 +41,7 @@ var Loader = (function() {
|
|||
}
|
||||
};
|
||||
|
||||
loadNextModule();
|
||||
loadNextModule();
|
||||
};
|
||||
|
||||
/* startModules()
|
||||
|
@ -60,7 +60,7 @@ var Loader = (function() {
|
|||
/* getAllModules()
|
||||
* Retrieve list of all modules.
|
||||
*
|
||||
* return array - module data as configured in config
|
||||
* return array - module data as configured in config
|
||||
*/
|
||||
var getAllModules = function() {
|
||||
return config.modules;
|
||||
|
@ -82,7 +82,7 @@ var Loader = (function() {
|
|||
var elements = module.split('/');
|
||||
var moduleName = elements[elements.length - 1];
|
||||
var moduleFolder = config.paths.modules + '/' + module;
|
||||
|
||||
|
||||
if (defaultModules.indexOf(moduleName) !== -1) {
|
||||
moduleFolder = config.paths.modules + '/default/' + module;
|
||||
}
|
||||
|
@ -130,8 +130,8 @@ var Loader = (function() {
|
|||
afterLoad();
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
/* bootstrapModule(module, mObj)
|
||||
* Bootstrap modules by setting the module data and loading the scripts & styles.
|
||||
|
@ -154,8 +154,8 @@ var Loader = (function() {
|
|||
callback();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
};
|
||||
|
||||
/* loadFile(fileName)
|
||||
|
@ -194,7 +194,7 @@ var Loader = (function() {
|
|||
};
|
||||
|
||||
document.getElementsByTagName("head")[0].appendChild(stylesheet);
|
||||
break;
|
||||
break;
|
||||
}
|
||||
|
||||
};
|
||||
|
@ -249,10 +249,3 @@ var Loader = (function() {
|
|||
};
|
||||
|
||||
})();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue