Changeset 1885 in subversion

Timestamp:

Sep 23, 2008 2:01:09 PM (5 years ago)

Author:

alec

Message:

#1485403: fix "bolding" of folder with subfolders with more than two levels

File:

• trunk/roundcubemail/program/js/app.js (modified) (3 diffs)

trunk/roundcubemail/program/js/app.js

@@ -3556 +3556 @@
     if (item = this.get_folder_li(mbox))
       {
-      mycount = this.env.unread_counts[mbox];
+      mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
       text_obj = item.getElementsByTagName('a')[0];
       reg = /\s+\([0-9]+\)$/i;
@@ -3565 +3565 @@
         {
         // add children's counters
-        for (var k in this.env.unread_counts)
+        for (var k in this.env.unread_counts) 
           if (k.indexOf(mbox + this.env.delimiter) == 0) {
             childcount += this.env.unread_counts[k];
-          }
+          }
         }
 
@@ -3579 +3579 @@
 
       // set parent's display
-      reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+');
+      reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
       if (mbox.match(reg))
         this.set_unread_count_display(mbox.replace(reg, ''), false);