summaryrefslogtreecommitdiff
path: root/program/js/app.js
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-07-28 09:39:37 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-07-28 09:41:18 +0200
commit39bd9b8e298b21bbe652b31b940aa772bed7d8b2 (patch)
tree0035692a52e27158ebf6cbecaa1993d156518ef7 /program/js/app.js
parent835638037a6e11cfdf4fd84c4b362465937a5bba (diff)
Set 'compose_extwin' env property on every step; accept a list of URL parameters for the 'compose' command
Diffstat (limited to 'program/js/app.js')
-rw-r--r--program/js/app.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 98c4385a4..1cd09ded6 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -980,7 +980,7 @@ function rcube_webmail()
if (this.task == 'mail') {
url._mbox = this.env.mailbox;
if (props)
- url._to = props;
+ url._to = props;
// also send search request so we can go back to search result after message is sent
if (this.env.search_request)
url._search = this.env.search_request;
@@ -1008,8 +1008,12 @@ function rcube_webmail()
break;
}
}
- else if (props)
+ else if (props && typeof props == 'string') {
url._to = props;
+ }
+ else if (props && typeof props == 'object') {
+ $.extend(url, props);
+ }
this.open_compose_step(url);
break;