Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve fix for wrong alarm settings (#1764)

Browse source
This commit is contained in:
Thomas Bruederli 2013-04-18 15:28:03 +02:00
parent 395d55a680
commit 82907b0a09
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/calendar/calendar_ui.js
View file

@ -450,8 +450,9 @@ function rcube_calendar_ui(settings)
if (typeof event.alarms == 'string') if (typeof event.alarms == 'string')
event.alarms = event.alarms.split(';'); event.alarms = event.alarms.split(';');
for (var alarm, i=0; i < event.alarms.length; i++) { var valarms = event.alarms || [''];
alarm = String(event.alarms[i]).split(':'); for (var alarm, i=0; i < valarms.length; i++) {
alarm = String(valarms[i]).split(':');
if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY'; if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY';
$('#eventedit select.edit-alarm-type').val(alarm[1]); $('#eventedit select.edit-alarm-type').val(alarm[1]);

5
plugins/tasklist/tasklist.js
View file

@ -1011,8 +1011,9 @@ function rcube_tasklist_ui(settings)
if (typeof rec.alarms == 'string') if (typeof rec.alarms == 'string')
rec.alarms = rec.alarms.split(';'); rec.alarms = rec.alarms.split(';');
for (var alarm, i=0; i < rec.alarms.length; i++) { var valarms = rec.alarms || [''];
alarm = String(rec.alarms[i]).split(':'); for (var alarm, i=0; i < valarms.length; i++) {
alarm = String(valarms[i]).split(':');
if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY'; if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY';
$('#taskedit select.edit-alarm-type').val(alarm[1]); $('#taskedit select.edit-alarm-type').val(alarm[1]);