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

Don't use 'folderlist' GUI object identifier for calendars list (avoids Roundcube core to do some unwanted magic)

Browse source
This commit is contained in:
Thomas Bruederli 2014-03-24 15:09:44 +01:00
parent 8c8d8f2233
commit 377ba1be88
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
plugins/calendar/calendar_ui.js
View file

@ -2376,7 +2376,7 @@ function rcube_calendar_ui(settings)
for (var i=0; i < delete_ids.length; i++) { for (var i=0; i < delete_ids.length; i++) {
id = delete_ids[i]; id = delete_ids[i];
fc.fullCalendar('removeEventSource', this.calendars[id]); fc.fullCalendar('removeEventSource', this.calendars[id]);
$(rcmail.get_folder_li(id, 'rcmlical')).remove(); $('#rcmlical' + id).remove();
$('#edit-calendar option[value="'+id+'"]').remove(); $('#edit-calendar option[value="'+id+'"]').remove();
delete this.calendars[id]; delete this.calendars[id];
} }
@ -2563,7 +2563,7 @@ function rcube_calendar_ui(settings)
if (!source.active) { if (!source.active) {
source.active = true; source.active = true;
fc.fullCalendar('addEventSource', source); fc.fullCalendar('addEventSource', source);
$('#' + rcmail.get_folder_li(source.id, 'rcmlical').id + ' input').prop('checked', true); $('#rcmlical' + source.id + ' input').prop('checked', true);
} }
else else
fc.fullCalendar('refetchEvents', source); fc.fullCalendar('refetchEvents', source);
@ -2786,14 +2786,25 @@ function rcube_calendar_ui(settings)
fc.fullCalendar('option', 'height', $('#calendar').height() - footer); fc.fullCalendar('option', 'height', $('#calendar').height() - footer);
}; };
// mark the given calendar folder as selected
this.select_calendar = function(id)
{
var prefix = 'rcmlical';
$(rcmail.gui_objects.calendarslist).find('li.selected')
.removeClass('selected').addClass('unfocused');
$('#' + prefix + id, rcmail.gui_objects.calendarslist)
.removeClass('unfocused').addClass('selected');
// trigger event hook
rcmail.triggerEvent('selectfolder', { folder:name, prefix:prefix });
this.selected_calendar = id;
};
/*** startup code ***/ /*** startup code ***/
// destroy wrongly configured treelist widget for the calendars list
if (rcmail.gui_objects.folderlist && rcmail.treelist) {
rcmail.treelist = null;
}
// create list of event sources AKA calendars // create list of event sources AKA calendars
this.calendars = {}; this.calendars = {};
var id, li, cal, active, color, brightness, event_sources = []; var id, li, cal, active, color, brightness, event_sources = [];
@ -2824,7 +2835,7 @@ function rcube_calendar_ui(settings)
} }
// init event handler on calendar list checkbox // init event handler on calendar list checkbox
if ((li = rcmail.get_folder_li(id, 'rcmlical'))) { if ((li = rcube_find_object('rcmlical' + id))) {
$('#'+li.id+' input').click(function(e){ $('#'+li.id+' input').click(function(e){
var id = $(this).data('id'); var id = $(this).data('id');
if (me.calendars[id]) { // add or remove event source on click if (me.calendars[id]) { // add or remove event source on click
@ -2845,11 +2856,9 @@ function rcube_calendar_ui(settings)
}).data('id', id).get(0).checked = active; }).data('id', id).get(0).checked = active;
$(li).click(function(e){ $(li).click(function(e){
var id = $(this).data('id'); me.select_calendar($(this).data('id'));
rcmail.select_folder(id, 'rcmlical');
rcmail.enable_command('calendar-edit', true); rcmail.enable_command('calendar-edit', true);
rcmail.enable_command('calendar-remove', 'calendar-showurl', true); rcmail.enable_command('calendar-remove', 'calendar-showurl', true);
me.selected_calendar = id;
}) })
.dblclick(function(){ me.calendar_edit_dialog(me.calendars[me.selected_calendar]); }) .dblclick(function(){ me.calendar_edit_dialog(me.calendars[me.selected_calendar]); })
.data('id', id); .data('id', id);
@ -2866,7 +2875,7 @@ function rcube_calendar_ui(settings)
this.selected_calendar = settings.default_calendar; this.selected_calendar = settings.default_calendar;
if (this.selected_calendar) if (this.selected_calendar)
rcmail.select_folder(this.selected_calendar, 'rcmlical'); this.select_calendar(this.selected_calendar);
var viewdate = new Date(); var viewdate = new Date();
if (rcmail.env.date) if (rcmail.env.date)

2
plugins/calendar/lib/calendar_ui.php
View file

@ -223,7 +223,7 @@ class calendar_ui
} }
$this->rc->output->set_env('calendars', $jsenv); $this->rc->output->set_env('calendars', $jsenv);
$this->rc->output->add_gui_object('folderlist', $attrib['id']); $this->rc->output->add_gui_object('calendarslist', $attrib['id']);
return html::tag('ul', $attrib, $li, html::$common_attrib); return html::tag('ul', $attrib, $li, html::$common_attrib);
} }