holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Fix week view's now line jumped to wrong day for some timezones

Browse Source
This commit is contained in:
nathangray 2020-07-29 15:23:37 -10:00
parent d0f02afc28
commit 839a0e54a6
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/js/et2_widget_planner.js
View File

@ -832,8 +832,6 @@ var et2_calendar_planner = /** @class */ (function (_super) {
this.now_div.hide();
return false;
}
// Planner uses the dates, not just the times so need things right
now = new Date(now.valueOf() - now.getTimezoneOffset() * 60000);
var row = null;
for (var i = 0; i < this._children.length && row == null; i++) {
if (this._children[i].instanceOf(et2_widget_planner_row_1.et2_calendar_planner_row)) {

2
calendar/js/et2_widget_planner.ts
View File

@ -1071,8 +1071,6 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
return false;
}
// Planner uses the dates, not just the times so need things right
now = new Date(now.valueOf() - now.getTimezoneOffset()*60000);
let row = null;
for(let i = 0; i < this._children.length && row == null; i++)
{

2
calendar/js/et2_widget_timegrid.js
View File

@ -521,7 +521,7 @@ var et2_calendar_timegrid = /** @class */ (function (_super) {
if (day.getDate() >= now) {
day = this.day_widgets[i - 1];
this.now_div.appendTo(day.getDOMNode()).show();
var pos = day._time_to_position(now.getHours() * 60 + now.getMinutes());
var pos = day._time_to_position(now.getUTCHours() * 60 + now.getUTCMinutes());
//this.now_div.position({my: 'left', at: 'left', of: day.getDOMNode()});
this.now_div.css('top', pos + '%');
break;

2
calendar/js/et2_widget_timegrid.ts
View File

@ -714,7 +714,7 @@ export class et2_calendar_timegrid extends et2_calendar_view implements et2_IDet
{
day = this.day_widgets[i-1];
this.now_div.appendTo(day.getDOMNode()).show();
let pos = day._time_to_position(now.getHours() * 60 + now.getMinutes());
let pos = day._time_to_position(now.getUTCHours() * 60 + now.getUTCMinutes());
//this.now_div.position({my: 'left', at: 'left', of: day.getDOMNode()});
this.now_div.css('top', pos + '%');
break;

5
calendar/js/et2_widget_view.js
View File

@ -293,9 +293,10 @@ var et2_calendar_view = /** @class */ (function (_super) {
* @private
*/
et2_calendar_view.prototype._updateNow = function () {
var now = new Date();
var tempDate = new Date();
var now = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(), tempDate.getHours(), tempDate.getMinutes() - tempDate.getTimezoneOffset(), 0);
// Use date widget's existing functions to deal
this._date_helper.set_value(now);
this._date_helper.set_value(now.toJSON());
now = new Date(this._date_helper.getValue());
if (this.get_start_date() <= now && this.get_end_date() >= now) {
return now;

6
calendar/js/et2_widget_view.ts
View File

@ -365,9 +365,11 @@ export class et2_calendar_view extends et2_valueWidget
*/
public _updateNow()
{
let now = new Date();
var tempDate = new Date();
var now = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),tempDate.getHours(),tempDate.getMinutes()-tempDate.getTimezoneOffset(),0);
// Use date widget's existing functions to deal
this._date_helper.set_value(now);
this._date_helper.set_value(now.toJSON());
now = new Date(this._date_helper.getValue());
if(this.get_start_date() <= now && this.get_end_date() >= now)