kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-27 00:16:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge conflict.

Browse Source
This commit is contained in:
Michael Teeuw
2019-06-14 13:19:29 +02:00
parent 60b817ec8e 62cb3a610e
commit 7a272ef0ab
70 changed files with 2261 additions and 2633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/default/newsfeed/fetcher.js
View File

@@ -81,11 +81,10 @@ var Fetcher = function(url, reloadInterval, encoding, logFeedWarnings) {
scheduleTimer();
});
nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
headers = {"User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/" + global.version + " (https://github.com/MichMich/MagicMirror/)",
"Cache-Control": "max-age=0, no-cache, no-store, must-revalidate",
"Pragma": "no-cache"}
"Pragma": "no-cache"};
request({uri: url, encoding: null, headers: headers})
.on("error", function(error) {

4
modules/default/newsfeed/newsfeed.js
View File

@@ -191,7 +191,7 @@ Module.register("newsfeed",{
fullArticle.style.top = "0";
fullArticle.style.left = "0";
fullArticle.style.border = "none";
fullArticle.src = this.getActiveItemURL()
fullArticle.src = this.getActiveItemURL();
fullArticle.style.zIndex = 1;
wrapper.appendChild(fullArticle);
}
@@ -419,7 +419,7 @@ Module.register("newsfeed",{
date: this.newsItems[this.activeItem].pubdate,
desc: this.newsItems[this.activeItem].description,
url: this.getActiveItemURL()
})
});
} else {
Log.info(this.name + " - unknown notification, ignoring: " + notification);
}