Changeset 2153 in subversion

Timestamp:

Dec 15, 2008 3:06:59 PM (4 years ago)

Author:

alec

Message:

• fix unflagged icon setting on IE
• small code cleanups

Location:

trunk/roundcubemail

Files:

• program/js/app.js (modified) (3 diffs)
• skins/default/images/icons/blank.gif (added)
• skins/default/templates/mail.html (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -1625 +1625 @@
     if (rows[uid].flagged && this.env.flaggedicon)
       icn_src = this.env.flaggedicon;
-    else if (this.env.unflaggedicon)
+    else if (!rows[uid].flagged && this.env.unflaggedicon)
       icn_src = this.env.unflaggedicon;
 
@@ -3492 +3492 @@
       else if (col == 'subject' && this.message_list)
         this.message_list.subject_col = n+1;
-      else if (col == 'flag' && this.env.unflaggedicon)
-        {
-          cell.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
-        }
       }
   };
@@ -3557 +3553 @@
         if (flags.flagged && this.env.flaggedicon)
           col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
-        else if(this.env.unflaggedicon)
+        else if(!flags.flagged && this.env.unflaggedicon)
           col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
       }

trunk/roundcubemail/skins/default/templates/mail.html

@@ -57 +57 @@
   attachmentIcon="/images/icons/attachment.png"
   flaggedIcon="/images/icons/flagged.png"
-  unflaggedIcon="/images/blank.gif" />
+  unflaggedIcon="/images/icons/blank.gif" />
 </div>