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

Fix the hierarchical address book list and correctly apply the stored collapse/expand state

Browse source
This commit is contained in:
Thomas Bruederli 2015-03-12 19:12:51 +01:00
parent eb69c1a239
commit 69d702c6b2
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -224,11 +224,14 @@ class kolab_addressbook extends rcube_plugin
if (!empty($folder->children)) {
$child_html = $this->folder_tree_html($folder, $data, $jsdata);
if (!empty($child_html) && preg_match('!</ul>\n*$!', $content)) {
$content = preg_replace('!</ul>\n*$!', $child_html . '</ul>', $content);
// copy group items...
if (preg_match('!<ul[^>]*>(.*)</ul>\n*$!Ums', $content, $m)) {
$child_html = $m[1] . $child_html;
$content = substr($content, 0, -strlen($m[0]) - 1);
}
else if (!empty($child_html)) {
$content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)), $child_html);
// ... and re-create the subtree
if (!empty($child_html)) {
$content .= html::tag('ul', array('class' => 'groups', 'style' => ($is_collapsed ? "display:none;" : null)), $child_html);
}
}