kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-06 15:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix Indentation?"

Browse Source 
This reverts commit 2bf18d8bdab364636b2589a981c7e7fb395bc669.
This commit is contained in:
Nicholas Hubbard 2017-09-30 19:44:54 -04:00
parent 837e275bfd
commit cd129fb055
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/class.js
View File

@ -31,22 +31,22 @@
// Check if we're overwriting an existing function // Check if we're overwriting an existing function
prototype[name] = typeof prop[name] == "function" && prototype[name] = typeof prop[name] == "function" &&
typeof _super[name] == "function" && fnTest.test(prop[name]) ? (function(name, fn) { typeof _super[name] == "function" && fnTest.test(prop[name]) ? (function(name, fn) {
return function() { return function() {
var tmp = this._super; var tmp = this._super;
// Add a new ._super() method that is the same method // Add a new ._super() method that is the same method
// but on the super-class // but on the super-class
this._super = _super[name]; this._super = _super[name];
// The method only need to be bound temporarily, so we // The method only need to be bound temporarily, so we
// remove it when we're done executing // remove it when we're done executing
var ret = fn.apply(this, arguments); var ret = fn.apply(this, arguments);
this._super = tmp; this._super = tmp;
return ret; return ret;
}; };
})(name, prop[name]) : prop[name]; })(name, prop[name]) : prop[name];
} }
// The dummy class constructor // The dummy class constructor

4
modules/default/updatenotification/updatenotification.js
View File

@ -58,7 +58,9 @@ Module.register("updatenotification", {
wrapper.appendChild(message); wrapper.appendChild(message);
var subtext = document.createElement("div"); var subtext = document.createElement("div");
subtext.innerHTML = this.translate("UPDATE_INFO").replace("COMMIT_COUNT", this.status.behind + " " + ((this.status.behind == 1)? "commit" : "commits")).replace("BRANCH_NAME", this.status.current); subtext.innerHTML = this.translate("UPDATE_INFO")
.replace("COMMIT_COUNT", this.status.behind + " " + ((this.status.behind == 1)? "commit" : "commits"))
.replace("BRANCH_NAME", this.status.current);
subtext.className = "xsmall dimmed"; subtext.className = "xsmall dimmed";
wrapper.appendChild(subtext); wrapper.appendChild(subtext);
} }

2
tests/configs/check_config.js
View File

@ -48,7 +48,7 @@ try {
// In case the there errors show messages and // In case the there errors show messages and
// return // return
console.info(Utils.colors.info("Checking file... ", configFileName)); console.info(Utils.colors.info("Checking file... ", configFileName));
// I'm not sure if all ever is utf-8 // I'm not sure if all ever is utf-8
fs.readFile(configFileName, "utf-8", function(err, data) { fs.readFile(configFileName, "utf-8", function(err, data) {
if (err) {throw err;} if (err) {throw err;}
v.JSHINT(data); // Parser by jshint v.JSHINT(data); // Parser by jshint