From a2b638320425309dd9af9ec8d53b925890628783 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 17 Dec 2012 08:13:28 +0100 Subject: Fix keep-alive interval reset on AJAX request --- program/js/app.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index a0cf5f834..f1df73cee 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -6128,14 +6128,14 @@ function rcube_webmail() // send request this.log('HTTP GET: ' + url); + // reset keep-alive interval + this.start_keepalive(); + return $.ajax({ type: 'GET', url: url, data: { _unlock:(lock?lock:0) }, dataType: 'json', success: function(data){ ref.http_response(data); }, error: function(o, status, err) { ref.http_error(o, status, err, lock, action); } }); - - // reset keep-alive interval - this.start_keepalive(); }; // send a http POST request to the server @@ -6163,14 +6163,14 @@ function rcube_webmail() // send request this.log('HTTP POST: ' + url); + // reset keep-alive interval + this.start_keepalive(); + return $.ajax({ type: 'POST', url: url, data: postdata, dataType: 'json', success: function(data){ ref.http_response(data); }, error: function(o, status, err) { ref.http_error(o, status, err, lock, action); } }); - - // reset keep-alive interval - this.start_keepalive(); }; // aborts ajax request -- cgit v1.2.3