From a2efac5e7bc1951799517c3c63559166d11d0768 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 15 Dec 2008 15:06:59 -0500
Subject: [PATCH] - fix unflagged icon setting on IE - small code cleanups
---
skins/default/templates/mail.html | 2 +-
program/js/app.js | 8 ++------
skins/default/images/icons/blank.gif | 0
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index c46997a..7e9509e 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -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')
diff --git a/skins/default/images/icons/blank.gif b/skins/default/images/icons/blank.gif
new file mode 100644
index 0000000..7dd464e
--- /dev/null
+++ b/skins/default/images/icons/blank.gif
Binary files differ
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index eed853a..2ab24e2 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -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" />
--
Gitblit v1.9.1