kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Midori 0.4.3 support

Browse Source
This commit is contained in:
Chris Pickett 2018-04-07 17:26:50 -05:00
parent cc0907fcd7
commit 6bb4db3842
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/main.js
View File

@ -21,7 +21,7 @@ var MM = (function() {
var createDomObjects = function() { var createDomObjects = function() {
var domCreationPromises = []; var domCreationPromises = [];
modules.forEach(module => { modules.forEach(function(module) {
if (typeof module.data.position !== "string") { if (typeof module.data.position !== "string") {
return; return;
} }
@ -52,14 +52,14 @@ var MM = (function() {
var domCreationPromise = updateDom(module, 0); var domCreationPromise = updateDom(module, 0);
domCreationPromises.push(domCreationPromise); domCreationPromises.push(domCreationPromise);
domCreationPromise.then(() => { domCreationPromise.then(function() {
sendNotification("MODULE_DOM_CREATED", null, null, module); sendNotification("MODULE_DOM_CREATED", null, null, module);
}).catch(Log.error); }).catch(Log.error);
}); });
updateWrapperStates(); updateWrapperStates();
Promise.all(domCreationPromises).then(() => { Promise.all(domCreationPromises).then(function() {
sendNotification("DOM_OBJECTS_CREATED"); sendNotification("DOM_OBJECTS_CREATED");
}); });
}; };
@ -106,7 +106,7 @@ var MM = (function() {
* return Promise - Resolved when the dom is fully updated. * return Promise - Resolved when the dom is fully updated.
*/ */
var updateDom = function(module, speed) { var updateDom = function(module, speed) {
return new Promise((resolve) => { return new Promise(function(resolve) {
var newContentPromise = module.getDom(); var newContentPromise = module.getDom();
var newHeader = module.getHeader(); var newHeader = module.getHeader();
@ -115,7 +115,7 @@ var MM = (function() {
newContentPromise = Promise.resolve(newContentPromise); newContentPromise = Promise.resolve(newContentPromise);
} }
newContentPromise.then((newContent) => { newContentPromise.then(function(newContent) {
var updatePromise = updateDomWithContent(module, speed, newHeader, newContent); var updatePromise = updateDomWithContent(module, speed, newHeader, newContent);
updatePromise.then(resolve).catch(Log.error); updatePromise.then(resolve).catch(Log.error);
@ -134,7 +134,7 @@ var MM = (function() {
* return Promise - Resolved when the module dom has been updated. * return Promise - Resolved when the module dom has been updated.
*/ */
var updateDomWithContent = function(module, speed, newHeader, newContent) { var updateDomWithContent = function(module, speed, newHeader, newContent) {
return new Promise((resolve) => { return new Promise(function(resolve) {
if (module.hidden || !speed) { if (module.hidden || !speed) {
updateModuleContent(module, newHeader, newContent); updateModuleContent(module, newHeader, newContent);
resolve(); resolve();

11
js/module.js
View File

@ -81,15 +81,16 @@ var Module = Class.extend({
* return DomObject | Promise - The dom or a promise with the dom to display. * return DomObject | Promise - The dom or a promise with the dom to display.
*/ */
getDom: function () { getDom: function () {
return new Promise((resolve) => { var self = this;
return new Promise(function(resolve) {
var div = document.createElement("div"); var div = document.createElement("div");
var template = this.getTemplate(); var template = self.getTemplate();
var templateData = this.getTemplateData(); var templateData = self.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)|(\.njk))$/.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) { self.nunjucksEnvironment().render(template, templateData, function (err, res) {
if (err) { if (err) {
Log.error(err) Log.error(err)
} }
@ -100,7 +101,7 @@ var Module = Class.extend({
}); });
} else { } else {
// the template is a template string. // the template is a template string.
div.innerHTML = this.nunjucksEnvironment().renderString(template, templateData); div.innerHTML = self.nunjucksEnvironment().renderString(template, templateData);
resolve(div); resolve(div);
} }

6
modules/default/compliments/compliments.js
View File

@ -55,8 +55,8 @@ Module.register("compliments", {
var self = this; var self = this;
if (this.config.remoteFile != null) { if (this.config.remoteFile != null) {
this.complimentFile((response) => { this.complimentFile(function(response) {
this.config.compliments = JSON.parse(response); self.config.compliments = JSON.parse(response);
self.updateDom(); self.updateDom();
}); });
} }
@ -197,4 +197,4 @@ Module.register("compliments", {
} }
}, },
}); });