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

Register handler for plugin.display_alarms only once; small code cleanup

Browse source
This commit is contained in:
Thomas Bruederli 2012-08-16 19:25:06 +02:00
parent d919e2b4bd
commit 758f7a120f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/calendar/calendar_ui.js
View file

@ -2625,7 +2625,6 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
rcmail.register_command('reset-search', function(){ cal.reset_quicksearch(); }, true); rcmail.register_command('reset-search', function(){ cal.reset_quicksearch(); }, true);
// register callback commands // 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.destroy_source', function(p){ cal.calendar_destroy_source(p.id); });
rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.unlock_saving(); }); rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.unlock_saving(); });
rcmail.addEventListener('plugin.refresh_calendar', function(p){ cal.refresh(p); }); rcmail.addEventListener('plugin.refresh_calendar', function(p){ cal.refresh(p); });

4
plugins/libcalendaring/libcalendaring.js
View file

@ -122,7 +122,7 @@ function rcube_libcalendaring(settings)
} }
// derived from http://delete.me.uk/2005/03/iso8601.html // 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) { if (!m) {
return null; return null;
} }
@ -317,7 +317,7 @@ function rcube_libcalendaring(settings)
this.alarm_dialog = $('<div>').attr('id', 'alarm-display'); this.alarm_dialog = $('<div>').attr('id', 'alarm-display');
var actions, adismiss, asnooze, alarm, html, event_ids = []; 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 = alarms[i];
alarm.start = parseISO8601(alarm.start); alarm.start = parseISO8601(alarm.start);
alarm.end = parseISO8601(alarm.end); alarm.end = parseISO8601(alarm.end);