github-mirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 17:44:52 -04:00
Code Issues Projects Releases Packages 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.

18
modules/default/calendar/calendar.js
View file

@ -332,7 +332,7 @@ Module.register("calendar", {
* return string - The Symbol
*/
symbolForUrl: function (url) {
return this.getCalendarProperty(url, "symbol", this.config.defaultSymbol);
return this.getCalendarProperty(url, "symbol", this.config.defaultSymbol);
},
/* colorForUrl(url)
@ -343,7 +343,7 @@ Module.register("calendar", {
* return string - The Color
*/
colorForUrl: function (url) {
return this.getCalendarProperty(url, "color", "#fff");
return this.getCalendarProperty(url, "color", "#fff");
},
/* countTitleForUrl(url)
@ -367,14 +367,14 @@ Module.register("calendar", {
* return string - The Property
*/
getCalendarProperty: function (url, property, defaultValue) {
for (var c in this.config.calendars) {
var calendar = this.config.calendars[c];
if (calendar.url === url && typeof calendar[property] === "string") {
return calendar[property];
}
}
for (var c in this.config.calendars) {
var calendar = this.config.calendars[c];
if (calendar.url === url && typeof calendar[property] === "string") {
return calendar[property];
}
}
return defaultValue;
return defaultValue;
},
/* shorten(string, maxLength)

30
modules/default/clock/clock.js
View file

@ -76,9 +76,9 @@ Module.register("clock",{
}
var hourSymbol = "HH";
if (this.config.timeFormat !== 24) {
hourSymbol = "h";
}
if (this.config.timeFormat !== 24) {
hourSymbol = "h";
}
if (this.config.clockBold === true) {
timeString = now.format(hourSymbol + "[<span class=\"bold\">]mm[</span>]");
@ -199,17 +199,17 @@ Module.register("clock",{
digitalWrapper.appendChild(timeWrapper);
var appendClocks = function(condition, pos1, pos2) {
var padding = [0,0,0,0];
padding[(placement === condition) ? pos1 : pos2] = "20px";
analogWrapper.style.padding = padding.join(" ");
if (placement === condition) {
wrapper.appendChild(analogWrapper);
wrapper.appendChild(digitalWrapper);
} else {
wrapper.appendChild(digitalWrapper);
wrapper.appendChild(analogWrapper);
}
}
var padding = [0,0,0,0];
padding[(placement === condition) ? pos1 : pos2] = "20px";
analogWrapper.style.padding = padding.join(" ");
if (placement === condition) {
wrapper.appendChild(analogWrapper);
wrapper.appendChild(digitalWrapper);
} else {
wrapper.appendChild(digitalWrapper);
wrapper.appendChild(analogWrapper);
}
};
if (placement === "left" || placement === "right") {
digitalWrapper.style.display = "inline-block";
@ -220,7 +220,7 @@ Module.register("clock",{
} else {
digitalWrapper.style.textAlign = "center";
appendClocks("top", 2, 0);
appendClocks("top", 2, 0);
}
}