Changeset 651da79 in github

Timestamp:

Apr 14, 2012 2:28:10 AM (13 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo

Children:

9870dac

Parents:

69baeef

Message:

• Fix folder collapsing/expanding broken with framework merge (#1488430)

File:

• program/include/rcube_ui.php (modified) (3 diffs)

program/include/rcube_ui.php

@@ -843 +843 @@
             $title        = null;
             $folder_class = self::folder_classname($folder['id']);
-            $collapsed    = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
+            $is_collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
             $unread       = $msgcounts ? intval($msgcounts[$folder['id']]['UNSEEN']) : 0;
 
@@ -897 +897 @@
                 html::a($link_attrib, $html_name) .
                 (!empty($folder['folders']) ? html::div(array(
-                    'class' => ($collapsed ? 'collapsed' : 'expanded'),
+                    'class' => ($is_collapsed ? 'collapsed' : 'expanded'),
                     'style' => "position:absolute",
                     'onclick' => sprintf("%s.command('collapse-folder', '%s')", JS_OBJECT_NAME, $js_name)
@@ -909 +909 @@
 
             if (!empty($folder['folders'])) {
-                $out .= html::tag('ul', array('style' => ($collapsed ? "display:none;" : null)),
+                $out .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
                     self::render_folder_tree_html($folder['folders'], $mbox_name, $jslist, $attrib, $nestLevel+1));
             }