From 5db5839c41ba7b25747d557307ece35b2c99860c Mon Sep 17 00:00:00 2001 From: alec Date: Sun, 13 Apr 2008 07:47:30 +0000 Subject: - don't change icon of deleted message when marking as read git-svn-id: https://svn.roundcube.net/trunk@1294 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/js/app.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 3ed681719..76d77610b 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -1560,13 +1560,13 @@ function rcube_webmail() rows[uid].classname = rows[uid].classname.replace(/\s*unread/, ''); this.set_classname(rows[uid].obj, 'unread', false); - if (rows[uid].replied && this.env.repliedicon) - icn_src = this.env.repliedicon; - else if (this.env.messageicon) + if (this.env.messageicon) icn_src = this.env.messageicon; } - if (rows[uid].icon && icn_src) + if (rows[uid].icon && icn_src + && !(rows[uid].replied && this.env.repliedicon) + && !(rows[uid].deleted && this.env.deletedicon)) rows[uid].icon.src = icn_src; } } @@ -1587,6 +1587,8 @@ function rcube_webmail() if (rows[uid].replied && parent.rcmail.env.repliedicon) icn_src = parent.rcmail.env.repliedicon; + else if (rows[uid].deleted && parent.rcmail.env.deletedicon) + icn_src = parent.rcmail.env.deletedicon; else if (parent.rcmail.env.messageicon) icn_src = parent.rcmail.env.messageicon; -- cgit v1.2.3