summaryrefslogtreecommitdiff
path: root/program/js/app.js
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-07-12 11:25:22 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-07-12 11:25:22 +0200
commit3f9518f0a7e49ec259299093ae63f7de5b2f430e (patch)
treebdba5453dc5276711edcccb94e4d9852c9e3f09e /program/js/app.js
parent3a8633cdc3c2b07450f25a5f1d23c310d492a9dd (diff)
parentc4c9e8cdfce1c5734d9d75c79b9cec012bca57ad (diff)
Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
Diffstat (limited to 'program/js/app.js')
-rw-r--r--program/js/app.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 8d02f6f39..ae9f4e972 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -60,6 +60,8 @@ function rcube_webmail()
beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
});
+ $(window).bind('beforeunload', function() { rcmail.unload = true; });
+
// set environment variable(s)
this.set_env = function(p, value)
{
@@ -6129,6 +6131,10 @@ function rcube_webmail()
this.set_busy(false, null, lock);
request.abort();
+ // don't display error message on page unload (#1488547)
+ if (this.unload)
+ return;
+
if (request.status && errmsg)
this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
else if (status == 'timeout')