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

This commit is contained in:
Kevin Granger
2013-10-21 18:03:15 +02:00
5 changed files with 16 additions and 13 deletions
+4 -2
View File
@@ -861,12 +861,14 @@ $(document).ready(function()
});
$('#ajax_running').ajaxStop(function() {
$(this).slideUp('fast');
var element = $(this)
setTimeout(function(){element.slideUp('fast')}, 1000);
clearTimeout(ajax_running_timeout);
});
$('#ajax_running').ajaxError(function() {
$(this).slideUp('fast');
var element = $(this)
setTimeout(function(){element.slideUp('fast')}, 1000);
clearTimeout(ajax_running_timeout);
});