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

fix indentation

Browse Source
This commit is contained in:
fewieden
2017-02-08 00:05:28 +01:00
parent 2f71a43420
commit 6cb3cf8747
4 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
js/main.js
View File

@@ -326,7 +326,7 @@ var MM = (function() {
* return array - Filtered collection of modules.
*/
var exceptWithClass = function(className) {
return modulesByClass(className, false);
return modulesByClass(className, false);
};
/* modulesByClass(className, include)
@@ -338,27 +338,27 @@ var MM = (function() {
* return array - Filtered collection of modules.
*/
var modulesByClass = function(className, include) {
var searchClasses = className;
if (typeof className === "string") {
searchClasses = className.split(" ");
}
var searchClasses = className;
if (typeof className === "string") {
searchClasses = className.split(" ");
}
var newModules = modules.filter(function(module) {
var classes = module.data.classes.toLowerCase().split(" ");
var newModules = modules.filter(function(module) {
var classes = module.data.classes.toLowerCase().split(" ");
for (var c in searchClasses) {
var searchClass = searchClasses[c];
if (classes.indexOf(searchClass.toLowerCase()) !== -1) {
return include;
}
}
for (var c in searchClasses) {
var searchClass = searchClasses[c];
if (classes.indexOf(searchClass.toLowerCase()) !== -1) {
return include;
}
}
return !include;
});
return !include;
});
setSelectionMethodsForModules(newModules);
return newModules;
};
setSelectionMethodsForModules(newModules);
return newModules;
};
/* exceptModule(module)
* Removes a module instance from the collection.

34
js/module.js
View File

@@ -203,7 +203,7 @@ var Module = Class.extend({
* argument callback function - Function called when done.
*/
loadStyles: function (callback) {
this.loadDependencies("getStyles", callback);
this.loadDependencies("getStyles", callback);
},
/* loadScripts()
@@ -221,24 +221,24 @@ var Module = Class.extend({
* argument funcName string - Function name to call to get scripts or styles.
* argument callback function - Function called when done.
*/
loadDependencies: function (funcName, callback) {
var self = this;
var dependencies = this[funcName]();
loadDependencies: function (funcName, callback) {
var self = this;
var dependencies = this[funcName]();
var loadNextDependency = function () {
if (dependencies.length > 0) {
var nextDependency = dependencies[0];
Loader.loadFile(nextDependency, self, function () {
dependencies = dependencies.slice(1);
loadNextDependency();
});
} else {
callback();
}
};
var loadNextDependency = function () {
if (dependencies.length > 0) {
var nextDependency = dependencies[0];
Loader.loadFile(nextDependency, self, function () {
dependencies = dependencies.slice(1);
loadNextDependency();
});
} else {
callback();
}
};
loadNextDependency();
},
loadNextDependency();
},
/* loadScripts()
* Load all required scripts by requesting the MM object to load the files.