plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Thu Jul 3 14:54:18 CEST 2014
plugins/calendar/calendar_ui.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit dddb045c1d42cb6e99780e0734a8af77ffe718ed
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Jul 3 14:54:09 2014 +0200
Avoid javascript errors in email view when creating event from mail
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index d10e899..fc41f1a 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2807,9 +2807,10 @@ function rcube_calendar_ui(settings)
};
// mark the given calendar folder as selected
- this.select_calendar = function(id)
+ this.select_calendar = function(id, nolistupdate)
{
- calendars_list.select(id);
+ if (!nolistupdate)
+ calendars_list.select(id);
// trigger event hook
rcmail.triggerEvent('selectfolder', { folder:id, prefix:'rcmlical' });
@@ -2870,7 +2871,7 @@ function rcube_calendar_ui(settings)
add_calendar_source(cal);
// check active calendars
- $('#rcmlical'+id+' > .calendar input').get(0).checked = active;
+ $('#rcmlical'+id+' > .calendar input').prop('checked', active);
if (active) {
event_sources.push(this.calendars[id]);
@@ -2895,9 +2896,11 @@ function rcube_calendar_ui(settings)
search_title: rcmail.gettext('calsearchresults','calendar')
});
calendars_list.addEventListener('select', function(node) {
- me.select_calendar(node.id);
- rcmail.enable_command('calendar-edit', 'calendar-showurl', true);
- rcmail.enable_command('calendar-remove', !me.calendars[node.id].readonly);
+ if (node && node.id && me.calendars[node.id]) {
+ me.select_calendar(node.id, true);
+ rcmail.enable_command('calendar-edit', 'calendar-showurl', true);
+ rcmail.enable_command('calendar-remove', !me.calendars[node.id].readonly);
+ }
});
calendars_list.addEventListener('insert-item', function(p) {
var cal = p.data;
More information about the commits
mailing list