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

Prevent getModules() selectors from returning duplicate entries.

Browse Source
This commit is contained in:
Michael Teeuw
2016-07-14 11:48:37 +02:00
parent 1f558d46a4
commit c81db752f6
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
js/main.js
View File

@@ -1,4 +1,5 @@
/* global Log, Loader, Module, config, defaults */
/* jshint -W020 */
/* Magic Mirror
* Main System
@@ -225,24 +226,23 @@ var MM = (function() {
* return array - Filtered collection of modules.
*/
var withClass = function(className) {
var newModules = [];
var searchClasses = className;
if (typeof className === "string") {
searchClasses = className.split(" ");
}
for (var m in modules) {
var module = modules[m];
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) {
newModules.push(module);
return true;
}
}
}
return false;
});
setSelectionMethodsForModules(newModules);
return newModules;
@@ -256,28 +256,23 @@ var MM = (function() {
* return array - Filtered collection of modules.
*/
var exceptWithClass = function(className) {
var newModules = [];
var searchClasses = className;
if (typeof className === "string") {
searchClasses = className.split(" ");
}
for (var m in modules) {
var module = modules[m];
var newModules = modules.filter(function(module) {
var classes = module.data.classes.toLowerCase().split(" ");
var foundClass = false;
for (var c in searchClasses) {
var searchClass = searchClasses[c];
if (classes.indexOf(searchClass.toLowerCase()) !== -1) {
foundClass = true;
break;
return false;
}
}
if (!foundClass) {
newModules.push(module);
}
}
return true;
});
setSelectionMethodsForModules(newModules);
return newModules;
@@ -291,14 +286,9 @@ var MM = (function() {
* return array - Filtered collection of modules.
*/
var exceptModule = function(module) {
var newModules = [];
for (var m in modules) {
var mod = modules[m];
if (mod.identifier !== module.identifier) {
newModules.push(mod);
}
}
var newModules = modules.filter(function(mod) {
return mod.identifier !== module.identifier;
});
setSelectionMethodsForModules(newModules);
return newModules;
@@ -310,10 +300,9 @@ var MM = (function() {
* argument callback function - The function to execute with the module as an argument.
*/
var enumerate = function(callback) {
for (var m in modules) {
var module = modules[m];
modules.map(function(module) {
callback(module);
}
});
};
if (typeof modules.withClass === "undefined") { Object.defineProperty(modules, "withClass", {value: withClass, enumerable: false}); }