Merge branch 'master' into 3140-project-content-tabs

[arvados.git] / apps / workbench / app / assets / javascripts / infinite_scroll.js

diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 3e15c9d970c3aac09bbc8840f2f04733e1ce484d..1f9997efa05fc002f8a9907965d73e9dff2b1a46 100644 (file)
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -3,22 +3,42 @@ function maybe_load_more_content() {
     var container;              // element that receives new content
     var src;                    // url for retrieving content
     var scrollHeight;
+    var spinner, colspan;
     scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight;
+    var num_scrollers = $(window).data("arv-num-scrollers");
     if ($(scroller).scrollTop() + $(scroller).height()
         >
-        scrollHeight - 50) {
-        container = $(this).data('infinite-container');
-        src = $(container).attr('data-infinite-content-href');
-        if (!src)
-            // Finished
-            return;
+        scrollHeight - 50)
+    {
+      for (var i = 0; i < num_scrollers; i++) {
+        $container = $($(this).data('infinite-container'+i));
+        src = $container.attr('data-infinite-content-href');
+        if (!src || !$container.is(':visible'))
+          continue;
+
         // Don't start another request until this one finishes
-        $(container).attr('data-infinite-content-href', null);
+        $container.attr('data-infinite-content-href', null);
+        spinner = '<div class="spinner spinner-32px spinner-h-center"></div>';
+        if ($(container).is('table,tbody,thead,tfoot')) {
+            // Hack to determine how many columns a new tr should have
+            // in order to reach full width.
+            colspan = $container.closest('table').
+                find('tr').eq(0).find('td,th').length;
+            if (colspan == 0)
+                colspan = '*';
+            spinner = ('<tr class="spinner"><td colspan="' + colspan + '">' +
+                       spinner +
+                       '</td></tr>');
+        }
+        $container.append(spinner);
         $.ajax(src,
                {dataType: 'json',
                 type: 'GET',
                 data: {},
-                context: {container: container, src: src}}).
+                context: {container: $container, src: src}}).
+            always(function() {
+                $(this.container).find(".spinner").detach();
+            }).
             fail(function(jqxhr, status, error) {
                 if (jqxhr.readyState == 0 || jqxhr.status == 0) {
                     message = "Cancelled."
@@ -34,19 +54,25 @@ function maybe_load_more_content() {
             done(function(data, status, jqxhr) {
                 $(this.container).append(data.content);
                 $(this.container).attr('data-infinite-content-href', data.next_page_href);
-                $(document).trigger('ajax:complete');
             });
-    }
+        break;
+     }
+   }
 }
+
 $(document).
     on('ready ajax:complete', function() {
+        var num_scrollers = 0;
         $('[data-infinite-scroller]').each(function() {
             var $scroller = $($(this).attr('data-infinite-scroller'));
-            if (!$scroller.hasClass('smart-scroll'))
+            if (!$scroller.hasClass('smart-scroll') &&
+                'scroll' != $scroller.css('overflow-y'))
                 $scroller = $(window);
             $scroller.
                 addClass('infinite-scroller').
-                data('infinite-container', this).
+                data('infinite-container'+num_scrollers, this).
                 on('scroll', maybe_load_more_content);
+            num_scrollers++;
         });
+        $(window).data("arv-num-scrollers", num_scrollers);
     });