folderImg is the default for the 'cl' property

And folderopenImg is handled by 'exp' and 'col'
horde · May 21, 2014 · 96c3b92 · 96c3b92
1 parent bd3796b
commit 96c3b92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
@@ -3566,6 +3566,7 @@ var DimpBase = {
     {
         var div, f_node, ftype, li, ll, parent_c, parent_e, tmp, tmp2,
             cname = 'imp-sidebar-container',
+            css = ob.cl || 'folderImg',
             label = ob.l || ob.m,
             title = ob.t || ob.m;
 
@@ -3629,7 +3630,7 @@ var DimpBase = {
         }
 
         if (ob.s) {
-            div.removeClassName('exp').addClassName(ob.cl || 'folderImg');
+            div.removeClassName('exp').addClassName(css);
             parent_e = $('imp-specialmboxes');
 
             /* Create a dummy container element in normal mailboxes section
@@ -3648,7 +3649,7 @@ var DimpBase = {
         }
 
         if (!ob.s) {
-            div.addClassName(ob.ch ? 'exp' : (ob.cl || 'folderImg'));
+            div.addClassName(ob.ch ? 'exp' : css);
             parent_e = ob.pa
                 ? this.getSubMboxElt(ob.pa)
                 : $('imp-normalmboxes');

diff --git a/imp/lib/Ajax/Queue.php b/imp/lib/Ajax/Queue.php
@@ -586,7 +586,7 @@ protected function _addFtreeInfo(IMP_Ajax_Application $ajax)
      *   - ch: (boolean) [children] Does the mailbox contain children?
      *         DEFAULT: no
      *   - cl: (string) [class] The CSS class.
-     *         DEFAULT: 'base'
+     *         DEFAULT: 'folderImg'
      *   - co: (boolean) [container] Is this mailbox a container element?
      *         DEFAULT: no
      *   - fs: (boolean) [boolean] Fixed element for sorting purposes.
@@ -698,7 +698,7 @@ protected function _ftreeElt($id)
         if ($icon->user_icon) {
             $ob->cl = 'customimg';
             $ob->i = strval($icon->icon);
-        } else {
+        } elseif (!in_array($icon->class, array('folderImg', 'folderopenImg'))) {
             $ob->cl = $icon->class;
         }