Commit 920c3a64 authored by Markus Weiland's avatar Markus Weiland

Merge branch 'v5.0.0-alpha2' into 201

parents dbb6216f 2ca327b1
......@@ -85,7 +85,7 @@ exchChangeCalendarPropertiesReminder.prototype = {
// first alarm type.
var absDate = this._document.getElementById("reminder-absolute-date");
reminder.related = reminder.ALARM_RELATED_ABSOLUTE;
reminder.alarmDate = cal.jsDateToDateTime(absDate.value,
reminder.alarmDate = cal.dtz.jsDateToDateTime(absDate.value,
this._argument.timezone);
//reminder.offset = 0;
if ("DISPLAY" in allowedActionsMap) {
......
......@@ -4376,14 +4376,14 @@ calExchangeCalendar.prototype = {
}
else {
this.logInfo(" THIS IS STRANGE beginDate");
var oldBeginDate = cal.now();
var oldBeginDate = cal.dtz.now();
}
if (this.endDate) {
var oldEndDate = this.endDate.clone();
}
else {
this.logInfo(" THIS IS STRANGE endDate");
var oldEndDate = cal.now();
var oldEndDate = cal.dtz.now();
}
this.startDate = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment