From a164a2e64b65fbe0729f6d4326b0219f1914c139 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Mon, 06 Oct 2008 05:32:09 -0400 Subject: [PATCH] - #1485463: fixed css classes setting in messages list --- program/js/app.js | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index ce2b4f9..bf6e8bc 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -533,8 +533,7 @@ if (this.env.search_request<0 || (props != '' && (this.env.search_request && props != this.env.mailbox))) this.reset_qsearch(); - if (props != this.env.mailbox) - this.list_mailbox(props); + this.list_mailbox(props); if (this.env.trash_mailbox) this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage'); @@ -822,22 +821,27 @@ case 'compose': var url = this.env.comm_path+'&_action=compose'; - if (this.task=='mail' && this.env.mailbox==this.env.drafts_mailbox) + if (this.task=='mail') { - var uid; - if (uid = this.get_single_uid()) - url += '&_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox); - } + url += '&_mbox='+urlencode(this.env.mailbox); + + if (this.env.mailbox==this.env.drafts_mailbox) + { + var uid; + if (uid = this.get_single_uid()) + url += '&_draft_uid='+uid; + } + } // modify url if we're in addressbook else if (this.task=='addressbook') { // switch to mail compose step directly if (props && props.indexOf('@') > 0) - { + { url = this.get_task_url('mail', url); this.redirect(url + '&_to='+urlencode(props)); break; - } + } // use contact_id passed as command parameter var a_cids = new Array(); @@ -3402,7 +3406,11 @@ var row = document.createElement('TR'); row.id = 'rcmrow'+uid; - row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '')+(flags.deleted ? ' deleted' : ''); + row.className = 'message' + + (even ? ' even' : ' odd') + + (flags.unread ? ' unread' : '') + + (flags.deleted ? ' deleted' : '') + + (flags.flagged ? ' flagged' : ''); if (this.message_list.in_selection(uid)) row.className += ' selected'; -- Gitblit v1.9.1