mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-20 18:08:02 +02:00
* Calendar: Fix clicking a day in a different month in sidemenu jumped to wrong date
This commit is contained in:
parent
aa2570f2ea
commit
6c17f6c43d
@ -325,18 +325,29 @@ export class SidemenuDate extends Et2Date
|
|||||||
*
|
*
|
||||||
* @protected
|
* @protected
|
||||||
*/
|
*/
|
||||||
protected _handleHeaderChange()
|
protected _handleHeaderChange(selectedDates : Date[], value : string)
|
||||||
{
|
{
|
||||||
const maxDays = new Date(this._instance.currentYear, this._instance.currentMonth + 1, 0).getDate();
|
const update = {};
|
||||||
|
if(this.formatDate(selectedDates[0], this._instance.config.dateFormat) == value)
|
||||||
|
{
|
||||||
|
// Header changed, selected date did not - get a date in the new month
|
||||||
|
|
||||||
let temp_date = new Date("" + this._instance.currentYear + "-" +
|
const maxDays = new Date(this._instance.currentYear, this._instance.currentMonth + 1, 0).getDate();
|
||||||
(this._instance.currentMonth + 1) + "-" +
|
|
||||||
("" + Math.min(maxDays, new Date(this.value).getUTCDate())).padStart(2, "0")
|
|
||||||
);
|
|
||||||
temp_date.setUTCMinutes(temp_date.getUTCMinutes() + temp_date.getTimezoneOffset());
|
|
||||||
|
|
||||||
|
let temp_date = new Date("" + this._instance.currentYear + "-" +
|
||||||
|
(this._instance.currentMonth + 1) + "-" +
|
||||||
|
("" + Math.min(maxDays, new Date(this.value).getUTCDate())).padStart(2, "0")
|
||||||
|
);
|
||||||
|
temp_date.setUTCMinutes(temp_date.getUTCMinutes() + temp_date.getTimezoneOffset());
|
||||||
|
|
||||||
|
update['date'] = temp_date;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// User selected a date in a different month, header hasn't changed
|
||||||
|
update['date'] = value;
|
||||||
|
}
|
||||||
// Go directly
|
// Go directly
|
||||||
let update = {date: temp_date};
|
|
||||||
app.calendar.update_state(update);
|
app.calendar.update_state(update);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user