summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-05-30 15:19:05 +0200
committerAleksander Machniak <alec@alec.pl>2013-05-30 15:19:05 +0200
commit99e27c581eda16f8c3f942fc9f57ce5d56b8cba1 (patch)
treecdc82fed0d42182168cfe1fc28105162fc3d76cb
parent2f321c66005b16cccbc5a7e28648cba6cedc66a3 (diff)
Fix unintentional compose window resize (#1489114)
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7ef15b695..3574411d9 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)
- Implemented shared cache (rcube_cache_shared)
diff --git a/program/js/app.js b/program/js/app.js
index 7c4fbc133..d5a66abf0 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2974,7 +2974,8 @@ function rcube_webmail()
}
else {
this.redirect(url);
- window.resizeTo(Math.max(this.env.popup_width, $(window).width()), $(window).height() + 24);
+ if (this.env.extwin)
+ window.resizeTo(Math.max(this.env.popup_width, $(window).width()), $(window).height() + 24);
}
};