From d4783319a086b09eb50ac6ad5da93eb1eeb771ca Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Mon, 28 Jul 2014 09:39:37 +0200 Subject: Set 'compose_extwin' env property on every step; accept a list of URL parameters for the 'compose' command --- program/js/app.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'program/js/app.js') diff --git a/program/js/app.js b/program/js/app.js index e00479f90..b4e11b9d8 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1052,7 +1052,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; @@ -1080,8 +1080,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; -- cgit v1.2.3