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

fix conflict with master repo develop branch

Browse Source
This commit is contained in:
Sam Detweiler 2019-07-01 12:35:47 -05:00
parent 4084c57789
commit 7315f7d283
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/default/updatenotification/node_helper.js
View File

@ -70,14 +70,12 @@ module.exports = NodeHelper.create({
sg.git.fetch().status(function(err, data) { sg.git.fetch().status(function(err, data) {
data.module = sg.module; data.module = sg.module;
if (!err) { if (!err) {
sg.git.log({"-1": null}, sg.git.log({"-1": null}, function(err, data2) {
function(err, data2) {
if (!err && data2.latest && "hash" in data2.latest) { if (!err && data2.latest && "hash" in data2.latest) {
this.bound_data.hash = data2.latest.hash; data.hash = data2.latest.hash;
self.sendSocketNotification("STATUS", this.bound_data); self.sendSocketNotification("STATUS", data);
} }
}.bind({bound_data:data}) });
);
} }
}); });
}); });
@ -87,7 +85,7 @@ module.exports = NodeHelper.create({
scheduleNextFetch: function(delay) { scheduleNextFetch: function(delay) {
if (delay < 60 * 1000) { if (delay < 60 * 1000) {
delay = 60 * 1000 delay = 60 * 1000;
} }
var self = this; var self = this;

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

@ -5,11 +5,12 @@ Module.register("updatenotification", {
refreshInterval: 24 * 60 * 60 * 1000, // one day refreshInterval: 24 * 60 * 60 * 1000, // one day
}, },
status: false,
suspended: false, suspended: false,
moduleList: {}, moduleList: {},
start: function () { start: function () {
var self = this var self = this;
Log.log("Start updatenotification"); Log.log("Start updatenotification");
setInterval( () => { self.moduleList = {};self.updateDom(2) } , self.config.refreshInterval) setInterval( () => { self.moduleList = {};self.updateDom(2) } , self.config.refreshInterval)
}, },
@ -24,6 +25,7 @@ Module.register("updatenotification", {
socketNotificationReceived: function (notification, payload) { socketNotificationReceived: function (notification, payload) {
if (notification === "STATUS") { if (notification === "STATUS") {
//this.status = payload;
this.updateUI(payload); this.updateUI(payload);
} }
}, },
@ -62,7 +64,7 @@ Module.register("updatenotification", {
// Override dom generator. // Override dom generator.
getDom: function () { getDom: function () {
wrapper = document.createElement("div"); var wrapper = document.createElement("div");
if(this.suspended==false){ if(this.suspended==false){
// process the hash of module info found // process the hash of module info found
for(key of Object.keys(this.moduleList)){ for(key of Object.keys(this.moduleList)){