From ecbc8770c6aa9c2d68bf932f9dfa5dc8956bc8d1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 30 May 2013 15:19:05 +0200
Subject: Fix unintentional compose window resize (#1489114)

Conflicts:

	program/js/app.js
---
 CHANGELOG         | 1 +
 program/js/app.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 49e86413e..2c41057bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix unintentional compose window resize (#1489114)
 - Fix performance regression in text wrapping function (#1489133)
 - Fix connection to posgtres db using unix socket (#1489132)
 - Fix handling of comma when adding contact from contacts widget (#1489107)
diff --git a/program/js/app.js b/program/js/app.js
index d58a8f4fa..0561add36 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3021,7 +3021,8 @@ function rcube_webmail()
     }
     else {
       this.redirect(url);
-      window.resizeTo(Math.max(1150, $(window).width()), Math.max(900, $(window).height()));
+      if (this.env.extwin)
+        window.resizeTo(Math.max(1150, $(window).width()), Math.max(900, $(window).height()));
     }
   };
 
-- 
cgit v1.2.3