From eb514742ecf9ca2fb5331d6ccbe2f1a13accd438 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 24 Oct 2012 18:14:31 +0200
Subject: Show compose options if they were visible in opener

---
 program/js/app.js | 2 +-
 skins/larry/ui.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/program/js/app.js b/program/js/app.js
index b73148219..b80422983 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3039,7 +3039,7 @@ function rcube_webmail()
 
     // close compose step in opener
     if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
-      opener.history.back();
+      setTimeout(function(){ opener.history.back(); }, 100);
     }
 
     // configure parallel autocompletion
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 12dae3118..da4f2300e 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -96,6 +96,10 @@ function rcube_mail_ui()
           return false;
         }).css('cursor', 'pointer');
 
+        // toggle compose options if opened in new window and they were visible before
+        if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose' && $('#composeoptionstoggle', opener.document).hasClass('remove'))
+          $('#composeoptionstoggle').click();
+
         new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
           orientation:'v', relative:true, start:248, min:170, size:12, render:layout_composeview }).init();
       }
-- 
cgit v1.2.3