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

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
Download Patch File Download Diff File Expand all files Collapse all files

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

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