summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-03 06:58:06 +0000
committeralecpl <alec@alec.pl>2008-10-03 06:58:06 +0000
commit0bfbe62ab048477632013fd15d4d45bc20f67ede (patch)
treee2e6b3d577771040217e6055777364fc2a63423c
parentcf6a833c95a341c1eada992ed09afc650493fdaa (diff)
- save selected folder when go to compose (to back to proper folder)
-rw-r--r--program/js/app.js19
1 files changed, 12 insertions, 7 deletions
diff --git a/program/js/app.js b/program/js/app.js
index b7a3ed51c..59d23f101 100644
--- a/program/js/app.js
+++ b/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();