tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3621 from h0rmiga/fix/dst-detection-3607 

Fix DST detection
This commit is contained in:
Eric Lippmann 2018-11-19 17:25:20 +01:00 committed by GitHub
parent 4a0c1ccb03 f0f9ab0eb7
commit 74530b23e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/js/icinga/timezone.js
View File

@ -10,25 +10,11 @@
* @returns {Number} * @returns {Number}
*/ */
Date.prototype.getStdTimezoneOffset = function() { Date.prototype.getStdTimezoneOffset = function() {
if (Date.maxTimezoneOffset !== undefined) { var year = new Date().getFullYear();
return Date.maxTimezoneOffset; var offsetInJanuary = new Date(year, 0, 2).getTimezoneOffset();
} var offsetInJune = new Date(year, 5, 2).getTimezoneOffset();
var year = new Date().getYear(); return Math.max(offsetInJanuary, offsetInJune);
var previousOffset;
for (var i=0; i<12; i++) {
var d = new Date(year, i, 1);
if (previousOffset !== undefined) {
previousOffset = Math.max(previousOffset, d.getTimezoneOffset());
} else {
previousOffset = d.getTimezoneOffset();
}
}
Date.maxTimezoneOffset = previousOffset;
return Date.maxTimezoneOffset;
}; };
/** /**
@ -37,7 +23,7 @@
* @returns {boolean} * @returns {boolean}
*/ */
Date.prototype.isDst = function() { Date.prototype.isDst = function() {
return (this.getStdTimezoneOffset() === this.getTimezoneOffset()) ? false : true; return this.getStdTimezoneOffset() !== this.getTimezoneOffset();
}; };
/** /**