From 99e17f6131bf0eb1762ddc13766b41fcd1942a29 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 13 Jun 2013 09:12:07 -0400
Subject: [PATCH] Fix timeout issue on drag&drop uploads (#1489170)
---
program/js/app.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index d691c92..0dea592 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1047,7 +1047,6 @@
if (uid = this.get_single_uid()) {
ref.printwin = this.open_window(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''), true, true);
if (this.printwin) {
- setTimeout(function(){ ref.printwin.focus(); }, 20);
if (this.env.action != 'show')
this.mark_message('read', uid);
}
@@ -6434,6 +6433,7 @@
url: ref.url(ref.env.filedrop.action||'upload', { _id:ref.env.compose_id||ref.env.cid||'', _uploadid:ts, _remote:1 }),
contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
processData: false,
+ timeout: 0, // disable default timeout set in ajaxSetup()
data: formdata || multipart,
headers: {'X-Roundcube-Request': ref.env.request_token},
beforeSend: function(xhr, s) { if (!formdata && xhr.sendAsBinary) xhr.send = xhr.sendAsBinary; },
--
Gitblit v1.9.1