From 2ea46b7e30e08facaa8b9fde9b05862fb7719130 Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 3 Oct 2008 06:58:06 +0000 Subject: - save selected folder when go to compose (to back to proper folder) git-svn-id: https://svn.roundcube.net/trunk@1926 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/js/app.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index b7a3ed51c..59d23f101 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -821,22 +821,27 @@ function rcube_webmail() 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(); -- cgit v1.2.3