From e487e20d86137500cfe11a2c6c1e1fbd04ad45fe Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 15 Dec 2008 20:06:59 +0000
Subject: - fix unflagged icon setting on IE - small code cleanups

git-svn-id: https://svn.roundcube.net/trunk@2153 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/js/app.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'roundcubemail/program/js')

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index c46997afa..7e9509ec2 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1624,7 +1624,7 @@ function rcube_webmail()
     
     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 @@ function rcube_webmail()
         }
       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 @@ function rcube_webmail()
         {
         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')
-- 
cgit v1.2.3