kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 04:45:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into update_defaults

Browse Source
This commit is contained in:
Michael Teeuw
2021-01-21 15:11:31 +01:00
committed by GitHub
parent 58939bfd8c 01ff00fa31
commit 4d28688f30
22 changed files with 364 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/loader.js
View File

@@ -114,7 +114,7 @@ var Loader = (function () {
* @param {Function} callback Function called when done.
*/
var loadModule = function (module, callback) {
var url = module.path + "/" + module.file;
var url = module.path + module.file;
var afterLoad = function () {
var moduleObject = Module.create(module.name);

2
js/module.js
View File

@@ -176,7 +176,7 @@ var Module = Class.extend({
});
this._nunjucksEnvironment.addFilter("translate", function (str, variables) {
return self.translate(str, variables);
return nunjucks.runtime.markSafe(self.translate(str, variables));
});
return this._nunjucksEnvironment;