Register handler for plugin.display_alarms only once; small code cleanup
This commit is contained in:
parent
d919e2b4bd
commit
758f7a120f
2 changed files with 2 additions and 3 deletions
|
@ -2625,7 +2625,6 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
|
|||
rcmail.register_command('reset-search', function(){ cal.reset_quicksearch(); }, true);
|
||||
|
||||
// register callback commands
|
||||
rcmail.addEventListener('plugin.display_alarms', function(alarms){ cal.display_alarms(alarms); });
|
||||
rcmail.addEventListener('plugin.destroy_source', function(p){ cal.calendar_destroy_source(p.id); });
|
||||
rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.unlock_saving(); });
|
||||
rcmail.addEventListener('plugin.refresh_calendar', function(p){ cal.refresh(p); });
|
||||
|
|
|
@ -122,7 +122,7 @@ function rcube_libcalendaring(settings)
|
|||
}
|
||||
|
||||
// derived from http://delete.me.uk/2005/03/iso8601.html
|
||||
var m = s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);
|
||||
var m = s && s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);
|
||||
if (!m) {
|
||||
return null;
|
||||
}
|
||||
|
@ -317,7 +317,7 @@ function rcube_libcalendaring(settings)
|
|||
this.alarm_dialog = $('<div>').attr('id', 'alarm-display');
|
||||
|
||||
var actions, adismiss, asnooze, alarm, html, event_ids = [];
|
||||
for (var actions, html, alarm, i=0; i < alarms.length; i++) {
|
||||
for (var i=0; i < alarms.length; i++) {
|
||||
alarm = alarms[i];
|
||||
alarm.start = parseISO8601(alarm.start);
|
||||
alarm.end = parseISO8601(alarm.end);
|
||||
|
|
Loading…
Add table
Reference in a new issue