Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

This commit is contained in:
Kevin Granger committed 2013-10-31 11:34:58 +01:00
commit 03564fe0e5
1 file changed
+2 -2
+2 -2
View File
@@ -863,13 +863,13 @@ $(document).ready(function()
$('#ajax_running').ajaxStop(function() { $('#ajax_running').ajaxStop(function() {
var element = $(this) var element = $(this)
setTimeout(function(){element.slideUp('fast')}, 1000); setTimeout(function(){element.slideUp(150)}, 1000);
clearTimeout(ajax_running_timeout); clearTimeout(ajax_running_timeout);
}); });
$('#ajax_running').ajaxError(function() { $('#ajax_running').ajaxError(function() {
var element = $(this) var element = $(this)
setTimeout(function(){element.slideUp('fast')}, 1000); setTimeout(function(){element.slideUp(150)}, 1000);
clearTimeout(ajax_running_timeout); clearTimeout(ajax_running_timeout);
}); });