kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-10 09:14:37 +00:00
Code Issues Projects Releases Wiki Activity

remove callback hell

Browse Source
This commit is contained in:
Felix Wiedenbach 2021-01-29 22:34:12 +01:00
parent db24f20289
commit 308774c2a6
2 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/module.js
View File

@ -318,24 +318,24 @@ var Module = Class.extend({
const languages = Object.keys(translations); const languages = Object.keys(translations);
const fallbackLanguage = languages[0]; const fallbackLanguage = languages[0];
if (languages.length > 0) { if (languages.length === 0) {
const translationFile = translations[language]; return callback();
const translationsFallbackFile = translations[fallbackLanguage];
if (translationFile) {
Translator.load(this, translationFile, false, () => {
if (translationFile !== translationsFallbackFile) {
Translator.load(this, translationsFallbackFile, true, callback);
} else {
callback();
}
});
} else {
Translator.load(this, translationsFallbackFile, true, callback);
}
} else {
callback();
} }
const translationFile = translations[language];
const translationsFallbackFile = translations[fallbackLanguage];
if (!translationFile) {
return Translator.load(this, translationsFallbackFile, true, callback);
}
Translator.load(this, translationFile, false, () => {
if (translationFile !== translationsFallbackFile) {
Translator.load(this, translationsFallbackFile, true, callback);
} else {
callback();
}
});
}, },
/** /**

26
js/translator.js
View File

@ -103,26 +103,18 @@ var Translator = (function () {
* @param {boolean} isFallback Flag to indicate fallback translations. * @param {boolean} isFallback Flag to indicate fallback translations.
* @param {Function} callback Function called when done. * @param {Function} callback Function called when done.
*/ */
load: function (module, file, isFallback, callback) { load(module, file, isFallback, callback) {
if (!isFallback) { Log.log(`${module.name} - Load translation${isFallback && " fallback"}: ${file}`);
Log.log(module.name + " - Load translation: " + file);
} else { if (this.translationsFallback[module.name]) {
Log.log(module.name + " - Load translation fallback: " + file); return callback();
} }
var self = this; loadJSON(module.file(file), (json) => {
if (!this.translationsFallback[module.name]) { const property = isFallback ? "translationsFallback" : "translations";
loadJSON(module.file(file), function (json) { this[property][module.name] = json;
if (!isFallback) {
self.translations[module.name] = json;
} else {
self.translationsFallback[module.name] = json;
}
callback();
});
} else {
callback(); callback();
} });
}, },
/** /**