3140: apply infinite scrolling if the container is visible, when working with multipl...

diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 846f43c068b00a738f0f05a18a05b20195fe4c07..1f9997efa05fc002f8a9907965d73e9dff2b1a46 100644 (file)
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -5,15 +5,15 @@ function maybe_load_more_content() {
     var scrollHeight;
     var spinner, colspan;
     scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight;
-        var num_scrollers = $(window).data("arv-num-scrollers");
+    var num_scrollers = $(window).data("arv-num-scrollers");
     if ($(scroller).scrollTop() + $(scroller).height()
         >
-        scrollHeight - 50) {
-
-        for (var i = 0; i < num_scrollers; i++) {
+        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)
+        if (!src || !$container.is(':visible'))
           continue;
 
         // Don't start another request until this one finishes
@@ -56,9 +56,10 @@ function maybe_load_more_content() {
                 $(this.container).attr('data-infinite-content-href', data.next_page_href);
             });
         break;
-        }
-    }
+     }
+   }
 }
+
 $(document).
     on('ready ajax:complete', function() {
         var num_scrollers = 0;