From 4f4aa88da82c6fa5799bfd47ec6b43db219e2d31 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 25 May 2020 11:06:33 -0600 Subject: [PATCH] Calendar: fix add alarm only added 5 minutes, regardless of what was selected --- calendar/js/app.js | 17 ++++++++--------- calendar/js/app.ts | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/calendar/js/app.js b/calendar/js/app.js index 420010d948..3d9aca4221 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -2620,22 +2620,21 @@ var CalendarApp = /** @class */ (function (_super) { * * @param {widget object} _widget new_alarm[options] selectbox */ - CalendarApp.prototype.alarm_custom_date = function (_widget) { - var alarm_date = this.et2.getWidgetById('new_alarm[date]'); - var alarm_options = _widget || this.et2.getWidgetById('new_alarm[options]'); - var start = this.et2.getWidgetById('start'); - if (alarm_date && alarm_options - && start) { - if (alarm_options.get_value() != '0') { + CalendarApp.prototype.alarm_custom_date = function (selectbox, _widget) { + var alarm_date = this.et2.getInputWidgetById('new_alarm[date]'); + var alarm_options = _widget || this.et2.getInputWidgetById('new_alarm[options]'); + var start = this.et2.getInputWidgetById('start'); + if (alarm_date && alarm_options && start) { + if (alarm_options.getValue() != '0') { alarm_date.set_class('calendar_alarm_date_display'); } else { alarm_date.set_class(''); } - var startDate = typeof start.get_value != 'undefined' ? start.get_value() : start.value; + var startDate = typeof start.getValue != 'undefined' ? start.getValue() : start.value; if (startDate) { var date = new Date(startDate); - date.setTime(date.getTime() - 1000 * parseInt(alarm_options.get_value())); + date.setTime(date.getTime() - 1000 * parseInt(alarm_options.getValue())); alarm_date.set_value(date); } } diff --git a/calendar/js/app.ts b/calendar/js/app.ts index 6b0dc3d9d2..10059a14a7 100644 --- a/calendar/js/app.ts +++ b/calendar/js/app.ts @@ -3033,16 +3033,15 @@ class CalendarApp extends EgwApp * * @param {widget object} _widget new_alarm[options] selectbox */ - alarm_custom_date (_widget?) + alarm_custom_date (selectbox : HTMLInputElement, _widget? : et2_selectbox) { - var alarm_date = this.et2.getWidgetById('new_alarm[date]'); - var alarm_options = _widget || this.et2.getWidgetById('new_alarm[options]'); - var start = this.et2.getWidgetById('start'); + var alarm_date = this.et2.getInputWidgetById('new_alarm[date]'); + var alarm_options = _widget || this.et2.getInputWidgetById('new_alarm[options]'); + var start = this.et2.getInputWidgetById('start'); - if (alarm_date && alarm_options - && start) + if (alarm_date && alarm_options && start) { - if (alarm_options.get_value() != '0') + if (alarm_options.getValue() != '0') { alarm_date.set_class('calendar_alarm_date_display'); } @@ -3050,11 +3049,11 @@ class CalendarApp extends EgwApp { alarm_date.set_class(''); } - var startDate = typeof start.get_value != 'undefined'?start.get_value():start.value; + var startDate = typeof start.getValue != 'undefined'?start.getValue():start.value; if (startDate) { var date = new Date(startDate); - date.setTime(date.getTime() - 1000 * parseInt(alarm_options.get_value())); + date.setTime(date.getTime() - 1000 * parseInt(alarm_options.getValue())); alarm_date.set_value(date); } }