From c5519c7b7096b00f99d7a0f9c0f8e7ba685d1fcf Mon Sep 17 00:00:00 2001
From: aFolletete <alain.folletete@prestashop.com>
Date: Wed, 4 Jan 2012 13:49:18 +0000
Subject: [PATCH] // fix bug on Loading indicator

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12127 b9a71923-0436-4b27-9f14-aed3839534dd
---
 js/admin.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/js/admin.js b/js/admin.js
index 6c01757e7..860f24773 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -24,7 +24,6 @@
 */
 
 var ajax_running_timeout = null;
-var ajax_running_nb_queries = 0;
 
 if (!id_language)
 	var id_language = Number(1);
@@ -1026,24 +1025,15 @@ $(document).ready(function(){
 	});
 
 	$('#ajax_running').ajaxStart(function() {
-		ajax_running_timeout = setTimeout(function() {showAjaxOverlay()}, 500);
+		ajax_running_timeout = setTimeout(function() {showAjaxOverlay()}, 1000);
 	});
 
-	$('#ajax_running').ajaxSend(function() {
-		ajax_running_nb_queries += 1;
-	});
-
-	$('#ajax_running').ajaxComplete(function() {
-		ajax_running_nb_queries -= 1;
-		if (ajax_running_nb_queries <= 0)
-		{
-			$(this).slideUp('fast');
-			clearTimeout(ajax_running_timeout);
-		}
+	$('#ajax_running').ajaxStop(function() {
+		$(this).slideUp('fast');
+		clearTimeout(ajax_running_timeout);
 	});
 
 	$('#ajax_running').ajaxError(function() {
-		ajax_running_nb_queries = 0;
 		$(this).slideUp('fast');
 		clearTimeout(ajax_running_timeout);
 	});