diff --git a/jquery_loadinganimation.js b/jquery_loadinganimation.js index 056864ca4840aa2b73493052485162db1c4b303e..4c0561cbed224802f593dc862d08d3eb3a596fad 100644 --- a/jquery_loadinganimation.js +++ b/jquery_loadinganimation.js @@ -18,7 +18,6 @@ .find("a[href]" + settings.subselector) .not('a[href*="javascript:"]') .not('a[href^="#"]') - .not('a[target="_blank"]') .not(".noLoadingAnimation") .each( function (i, element) { @@ -42,9 +41,9 @@ if (Drupal.settings.jquery_loadinganimation.show_on_form_submit) { // Only execute if no other js events are registered to prevent cases // where page is not being reloaded and layer does not close though. - $(context).find("form" + subselectorSuffix).not(".noLoadingAnimation").submit(function () { + $(context).find("form" + subselectorSuffix).submit(function () { Drupal.behaviors.jquery_loadinganimation.Loadinganimation.show(); - $(context).ajaxStop(function () { + $(document).ajaxStop(function () { // Hide loading animation after ALL ajax events have finished Drupal.behaviors.jquery_loadinganimation.Loadinganimation.hide(); }); @@ -56,12 +55,12 @@ // Global context! if (Drupal.settings.jquery_loadinganimation.show_on_ajax) { // Register loading animations for ajax events! - $(context).ajaxStart(function () { + $(document).ajaxStart(function () { // Show loading animation on request. Drupal.behaviors.jquery_loadinganimation.Loadinganimation.show(); }); - $(context).ajaxStop(function () { + $(document).ajaxStop(function () { // Hide loading animation after finish. Drupal.behaviors.jquery_loadinganimation.Loadinganimation.hide(); });