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

Revert "Added autoLocation and autoTimezone option for weather modules and clock respectively."

Browse Source
This commit is contained in:
Michael Teeuw
2019-02-27 13:33:14 +01:00
committed by GitHub
parent de99c8a5e4
commit e4891e699f
7 changed files with 8 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/default/clock/clock.js
View File

@@ -26,7 +26,6 @@ Module.register("clock",{
analogShowDate: "top", // options: false, 'top', or 'bottom'
secondsColor: "#888888",
timezone: null,
autoTimezone: false
},
// Define required scripts.
getScripts: function() {
@@ -40,31 +39,16 @@ Module.register("clock",{
start: function() {
Log.info("Starting module: " + this.name);
if (this.config.autoTimezone) {
this.sendSocketNotification("AUTO_TIMEZONE");
} else {
// Schedule update interval.
var self = this;
setInterval(function() {
self.updateDom();
}, 1000);
}
// Schedule update interval.
var self = this;
setInterval(function() {
self.updateDom();
}, 1000);
// Set locale.
moment.locale(config.language);
},
socketNotificationReceived: function (notification, payload) {
if (notification === "UPDATE_TIMEZONE") {
var self = this;
self.config.timezone = payload.timezone;
setInterval(function() {
self.updateDom();
}, 1000);
}
},
// Override dom generator.
getDom: function() {

29
modules/default/clock/node_helper.js
View File

@@ -1,29 +0,0 @@
var http = require("http");
var NodeHelper = require("node_helper");
module.exports = NodeHelper.create({
start: function () {
},
socketNotificationReceived: function (notification, payload) {
var self = this;
if (notification === "AUTO_TIMEZONE") {
console.log("Loading timezone...");
http.get("http://ip-api.com/json", function (req) {
var data = "";
req.on("data", function (d) {
data += d;
});
req.on("end", function () {
var body = JSON.parse(data);
payload.timezone = body.timezone;
self.sendSocketNotification("UPDATE_TIMEZONE", payload);
});
}).on("error", function () {
payload.error = "Could not figure out the timezone.";
self.sendSocketNotification("UPDATE_TIMEZONE", payload);
});
}
}
});