[Svn] r2153 - in trunk/roundcubemail: program/js skins/default/images/icons skins/default/templates

trac at roundcube.net trac at roundcube.net
Mon Dec 15 21:06:59 CET 2008


Author: alec
Date: 2008-12-15 14:06:59 -0600 (Mon, 15 Dec 2008)
New Revision: 2153

Added:
   trunk/roundcubemail/skins/default/images/icons/blank.gif
Modified:
   trunk/roundcubemail/program/js/app.js
   trunk/roundcubemail/skins/default/templates/mail.html
Log:
- fix unflagged icon setting on IE
- small code cleanups


Modified: trunk/roundcubemail/program/js/app.js
===================================================================
--- trunk/roundcubemail/program/js/app.js	2008-12-15 08:22:20 UTC (rev 2152)
+++ trunk/roundcubemail/program/js/app.js	2008-12-15 20:06:59 UTC (rev 2153)
@@ -1624,7 +1624,7 @@
     
     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;
 
     if (rows[uid].flagged_icon && icn_src)
@@ -3491,10 +3491,6 @@
         }
       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="" />';
-	}
       }
   };
 
@@ -3556,7 +3552,7 @@
         {
         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="" />';
       }
       else if (c=='attachment')

Added: trunk/roundcubemail/skins/default/images/icons/blank.gif
===================================================================
(Binary files differ)


Property changes on: trunk/roundcubemail/skins/default/images/icons/blank.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/roundcubemail/skins/default/templates/mail.html
===================================================================
--- trunk/roundcubemail/skins/default/templates/mail.html	2008-12-15 08:22:20 UTC (rev 2152)
+++ trunk/roundcubemail/skins/default/templates/mail.html	2008-12-15 20:06:59 UTC (rev 2153)
@@ -56,7 +56,7 @@
   forwardedrepliedIcon="/images/icons/forwarded_replied.png"
   attachmentIcon="/images/icons/attachment.png"
   flaggedIcon="/images/icons/flagged.png"
-  unflaggedIcon="/images/blank.gif" />
+  unflaggedIcon="/images/icons/blank.gif" />
 </div>
 
 <roundcube:if condition="config:preview_pane == true" />

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list