kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Allow use of .njk extension for template files.

Browse Source
This commit is contained in:
Michael Teeuw 2017-10-18 13:49:03 +02:00
parent c75662e720
commit f4d5996a88
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/module.js
View File

@ -86,7 +86,7 @@ var Module = Class.extend({
var templateData = this.getTemplateData(); var templateData = this.getTemplateData();
// Check to see if we need to render a template string or a file. // Check to see if we need to render a template string or a file.
if (/^.*(\.html)$/.test(template)) { if (/^.*((\.html)|(\.njk))$/.test(template)) {
// the template is a filename // the template is a filename
this.nunjucksEnvironment().render(template, templateData, function (err, res) { this.nunjucksEnvironment().render(template, templateData, function (err, res) {
if (err) { if (err) {
@ -170,7 +170,10 @@ var Module = Class.extend({
var self = this; var self = this;
this._nunjucksEnvironment = new nunjucks.Environment(new nunjucks.WebLoader(this.file(""), {async: true})); this._nunjucksEnvironment = new nunjucks.Environment(new nunjucks.WebLoader(this.file(""), {async: true}), {
trimBlocks: true,
lstripBlocks: true
});
this._nunjucksEnvironment.addFilter("translate", function(str) { this._nunjucksEnvironment.addFilter("translate", function(str) {
return self.translate(str) return self.translate(str)
}); });

2
modules/default/helloworld/helloworld.js
View File

@ -15,7 +15,7 @@ Module.register("helloworld",{
}, },
getTemplate: function () { getTemplate: function () {
return "helloworld.html" return "helloworld.njk"
}, },
getTemplateData: function () { getTemplateData: function () {

0
modules/default/helloworld/helloworld.html → modules/default/helloworld/helloworld.njk
View File