From 1ad456ad4108b4f2f14aa155b6763288b3ca2f93 Mon Sep 17 00:00:00 2001 From: aFolletete Date: Wed, 4 Jan 2012 13:49:18 +0000 Subject: [PATCH] // fix bug on Loading indicator --- 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); });