Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #7473

Browse Source
This commit is contained in:
Julian Lam
2019-03-19 15:42:33 -04:00
parent c37b2f2ed3
commit c289b904e6
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/src/admin/settings/email.js
View File

@@ -87,18 +87,20 @@ define('admin/settings/email', ['ace/ace', 'admin/settings'], function (ace) {
return app.alertError(err.message); return app.alertError(err.message);
} }
now = new Date(now); var date = new Date(now.timestamp);
var offset = (new Date().getTimezoneOffset() - now.offset) / 60;
date.setHours(date.getHours() + offset);
$('#serverTime').text(now.toString()); $('#serverTime').text(date.toLocaleTimeString());
now.setHours(parseInt(hour, 10), 0, 0, 0); date.setHours(parseInt(hour, 10) - offset, 0, 0, 0);
// If adjusted time is in the past, move to next day // If adjusted time is in the past, move to next day
if (now.getTime() < Date.now()) { if (date.getTime() < Date.now()) {
now.setDate(now.getDate() + 1); date.setDate(date.getDate() + 1);
} }
$('#nextDigestTime').text(now.toString()); $('#nextDigestTime').text(date.toLocaleString());
}); });
} }

7
src/socket.io/meta.js
View File

@@ -62,7 +62,12 @@ function leaveCurrentRoom(socket) {
SocketMeta.getServerTime = function (socket, data, callback) { SocketMeta.getServerTime = function (socket, data, callback) {
// Returns server time in milliseconds // Returns server time in milliseconds
callback(null, Date.now()); const now = new Date();
callback(null, {
timestamp: now.getTime(),
offset: now.getTimezoneOffset(),
});
}; };
module.exports = SocketMeta; module.exports = SocketMeta;