projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2871-preload-objects
[arvados.git]
/
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 d66cb9224f0f703dfe8484b83b142d483d9b8901..7b09d5242cb5283f971ca216827c3105f55cc731 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/application.js
+++ b/
apps/workbench/app/assets/javascripts/application.js
@@
-43,12
+43,20
@@
jQuery(function($){
targets.fadeToggle(200);
});
targets.fadeToggle(200);
});
+ var ajaxCount = 0;
+
$(document).
on('ajax:send', function(e, xhr) {
$(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) {
}).
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)
}).
on('click', '.removable-tag a', function(e) {
var tag_span = $(this).parents('[data-tag-link-uuid]').eq(0)