summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-05 18:09:44 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-05 18:09:44 +0100
commit7bf6d2f01e6b5a24669febae3464f074d8c59cb7 (patch)
treed12d4b945e5643b1a6fada3416885ffa74e87d67 /program/js
parentcf57b2b130c459a1cc8d374e4c66ec93a81c7223 (diff)
Don't open another window when replying to a message displayed in extwin
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js19
1 files changed, 15 insertions, 4 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 6741a480e..d9801ffdc 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3018,10 +3018,13 @@ function rcube_webmail()
var url = this.url('mail/compose', p);
// open new compose window
- if (this.env.compose_extwin)
+ if (this.env.compose_extwin && !this.env.extwin) {
this.open_window(url, 1150, 900);
- else
+ }
+ else {
this.redirect(url);
+ window.resizeTo(Math.max(1150, $(window).width()), Math.max(900, $(window).height()));
+ }
};
// init message compose form: set focus and eventhandlers
@@ -6041,10 +6044,18 @@ function rcube_webmail()
if (lock || lock === null)
this.set_busy(true);
- if (this.is_framed())
+ if (this.is_framed()) {
parent.rcmail.redirect(url, lock);
- else
+ }
+ else {
+ if (this.env.extwin) {
+ if (typeof url == 'string')
+ url += (url.indexOf('?') < 0 ? '?' : '&') + '_extwin=1';
+ else
+ url._extwin = 1;
+ }
this.location_href(url, window);
+ }
};
this.goto_url = function(action, query, lock)