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

Fix folder list operations when search is active

Browse source
This commit is contained in:
Thomas Bruederli 2014-08-07 18:14:49 +02:00
parent e7f1fd4082
commit 07f05a102b
3 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/calendar_ui.js
View file

@ -3385,6 +3385,11 @@ function rcube_calendar_ui(settings)
me.calendars[id].active = false; me.calendars[id].active = false;
} }
// adjust checked state of original list item
if (calendars_list.is_search()) {
calendars_list.container.find('input[value="'+id+'"]').prop('checked', this.checked);
}
// add/remove event source // add/remove event source
fc.fullCalendar(action, me.calendars[id]); fc.fullCalendar(action, me.calendars[id]);
rcmail.http_post('calendar', { action:'subscribe', c:{ id:id, active:me.calendars[id].active?1:0 } }); rcmail.http_post('calendar', { action:'subscribe', c:{ id:id, active:me.calendars[id].active?1:0 } });
@ -3402,8 +3407,13 @@ function rcube_calendar_ui(settings)
// init (delegate) event handler on quickview links // init (delegate) event handler on quickview links
.on('click', 'a.quickview', function(e) { .on('click', 'a.quickview', function(e) {
var id = $(this).closest('li').attr('id').replace(/^rcmlical/, ''); var id = $(this).closest('li').attr('id').replace(/^rcmlical/, '');
if (calendars_list.is_search())
id = id.replace(/--xsR$/, '');
if (me.calendars[id]) if (me.calendars[id])
me.quickview(id); me.quickview(id);
e.stopPropagation(); e.stopPropagation();
return false; return false;
}); });

3
plugins/libkolab/js/folderlist.js
View file

@ -244,6 +244,9 @@ function kolab_folderlist(node, p)
id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''), id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''),
div = li.children().first(); div = li.children().first();
if (me.is_search())
id = id.replace(/--xsR$/, '');
if (p.id_decode) if (p.id_decode)
id = p.id_decode(id); id = p.id_decode(id);

13
plugins/tasklist/tasklist.js
View file

@ -197,6 +197,11 @@ function rcube_tasklist_ui(settings)
if (!this.checked && focusview == id) { if (!this.checked && focusview == id) {
set_focusview(null); set_focusview(null);
} }
// adjust checked state of original list item
if (tasklists_widget.is_search()) {
tasklists_widget.container.find('input[value="'+id+'"]').prop('checked', this.checked);
}
} }
e.stopPropagation(); e.stopPropagation();
}) })
@ -212,6 +217,10 @@ function rcube_tasklist_ui(settings)
// handler for clicks on quickview buttons // handler for clicks on quickview buttons
tasklists_widget.container.on('click', '.quickview', function(e){ tasklists_widget.container.on('click', '.quickview', function(e){
var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, ''); var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, '');
if (tasklists_widget.is_search())
id = id.replace(/--xsR$/, '');
set_focusview(focusview == id ? null : id); set_focusview(focusview == id ? null : id);
e.stopPropagation(); e.stopPropagation();
return false; return false;
@ -220,6 +229,10 @@ function rcube_tasklist_ui(settings)
// register dbl-click handler to open calendar edit dialog // register dbl-click handler to open calendar edit dialog
tasklists_widget.container.on('dblclick', ':not(.virtual) > .tasklist', function(e){ tasklists_widget.container.on('dblclick', ':not(.virtual) > .tasklist', function(e){
var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, ''); var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, '');
if (tasklists_widget.is_search())
id = id.replace(/--xsR$/, '');
list_edit_dialog(id); list_edit_dialog(id);
}); });