From 39bd9b8e298b21bbe652b31b940aa772bed7d8b2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
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')

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;
-- 
cgit v1.2.3