amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-24 06:19:30 +00:00
Code Issues Projects Releases Wiki Activity

(js) Handle DST change in Date.daysUpTo

Browse Source
This commit is contained in:
Francis Lachapelle
2019-10-04 09:54:29 -04:00
parent 349be8b4db
commit 10b5eb736f
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
UI/WebServerResources/js/Common/utils.js
View File

@@ -269,24 +269,25 @@ Date.prototype.clone = function() {
};
Date.prototype.daysUpTo = function(otherDate) {
var days = [];
var days = [];
var day1 = this.getTime();
var day2 = otherDate.getTime();
if (day1 > day2) {
var tmp = day1;
day1 = day2;
day2 = tmp;
}
var day1 = this.getTime();
var day2 = otherDate.getTime();
if (day1 > day2) {
var tmp = day1;
day1 = day2;
day2 = tmp;
}
var nbrDays = Math.round((day2 - day1) / 86400000) + 1;
for (var i = 0; i < nbrDays; i++) {
var newDate = new Date();
newDate.setTime(day1 + (i * 86400000));
days.push(newDate);
}
var DAY_SECS = 25 * 60 * 60 * 1000; // compensate for DST
var nbrDays = Math.round((day2 - day1) / DAY_SECS) + 1;
for (var i = 0; i < nbrDays; i++) {
var newDate = new Date();
newDate.setTime(day1 + (i * 86400000));
days.push(newDate);
}
return days;
return days;
};
Date.prototype.minutesTo = function(otherDate) {

2
UI/WebServerResources/js/Scheduler/ComponentController.js
View File

@@ -534,7 +534,7 @@
function updateFreeBusy() {
vm.component.$attendees.updateFreeBusyCoverage();
vm.component.$attendees.updateFreeBusy();
scrollToStart();
$timeout(scrollToStart);
}
}