X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/20334fa95bb7d554c09225c02fae3d4e83c6c6c5..eaa312ea7c35e35c64dbef9624be1d9c7df034ef:/apps/workbench/app/assets/javascripts/application.js diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js index 189063bcff..7b09d5242c 100644 --- a/apps/workbench/app/assets/javascripts/application.js +++ b/apps/workbench/app/assets/javascripts/application.js @@ -29,7 +29,6 @@ jQuery(function($){ 'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content') } }); - $('.editable').editable(); $('[data-toggle=tooltip]').tooltip(); $('.expand-collapse-row').on('click', function(event) { @@ -44,12 +43,20 @@ jQuery(function($){ targets.fadeToggle(200); }); + var ajaxCount = 0; + $(document). on('ajax:send', function(e, xhr) { - $('.loading').fadeTo('fast', 1); + ajaxCount += 1; + if (ajaxCount == 1) { + $('.loading').fadeTo('fast', 1); + } }). on('ajax:complete', function(e, status) { - $('.loading').fadeOut('fast', 0); + ajaxCount -= 1; + if (ajaxCount == 0) { + $('.loading').fadeOut('fast', 0); + } }). on('click', '.removable-tag a', function(e) { var tag_span = $(this).parents('[data-tag-link-uuid]').eq(0)