Bug fix since recent commits to master where Textile was not being rendered any more...

[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 3e74da3581d0b95573d946e3540d5d4e1d6be4a5..2cb9748dadc09e71596b9cd6e4264d11e16389c0 100644 (file)
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -1,6 +1,6 @@
-function maybe_load_more_content() {
+function maybe_load_more_content(event) {
     var scroller = this;        // element with scroll bars
-    var container;              // element that receives new content
+    var $container;             // element that receives new content
     var src;                    // url for retrieving content
     var scrollHeight;
     var spinner, colspan;
@@ -8,25 +8,27 @@ function maybe_load_more_content() {
     scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight;
     if ($(scroller).scrollTop() + $(scroller).height()
         >
-        scrollHeight - 50) {
-        container = $(this).data('infinite-container');
-        if (!$(container).attr('data-infinite-content-href0')) {
+        scrollHeight - 50)
+    {
+        $container = $(event.data.container);
+        if (!$container.attr('data-infinite-content-href0')) {
             // Remember the first page source url, so we can refresh
             // from page 1 later.
-            $(container).attr('data-infinite-content-href0',
-                              $(container).attr('data-infinite-content-href'));
+            $container.attr('data-infinite-content-href0',
+                            $container.attr('data-infinite-content-href'));
         }
-        src = $(container).attr('data-infinite-content-href');
-        if (!src)
+        src = $container.attr('data-infinite-content-href');
+        if (!src || !$container.is(':visible'))
             // Finished
             return;
+
         // 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')) {
+        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').
+            colspan = $container.closest('table').
                 find('tr').eq(0).find('td,th').length;
             if (colspan == 0)
                 colspan = '*';
@@ -34,17 +36,18 @@ function maybe_load_more_content() {
                        spinner +
                        '</td></tr>');
         }
-        $(container).find(".spinner").detach();
-        $(container).append(spinner);
-        $(container).attr('data-infinite-serial', serial);
+        $container.find(".spinner").detach();
+        $container.append(spinner);
+        $container.attr('data-infinite-serial', serial);
         $.ajax(src,
                {dataType: 'json',
                 type: 'GET',
-                data: ($(container).data('infinite-content-params') || {}),
-                context: {container: container, src: src, serial: serial}}).
+                data: ($container.data('infinite-content-params') || {}),
+                context: {container: $container, src: src, serial: serial}}).
             fail(function(jqxhr, status, error) {
                 var $faildiv;
-                if ($(this.container).attr('data-infinite-serial') != this.serial) {
+                var $container = this.container;
+                if ($container.attr('data-infinite-serial') != this.serial) {
                     // A newer request is already in progress.
                     return;
                 }
@@ -61,19 +64,20 @@ function maybe_load_more_content() {
                     attr('data-infinite-content-href', this.src).
                     addClass('infinite-retry').
                     append('<span class="fa fa-warning" /> Oops, request failed. <button class="btn btn-xs btn-primary">Retry</button>');
-                $(this.container).find('div.spinner').replaceWith($faildiv);
+                $container.find('div.spinner').replaceWith($faildiv);
             }).
             done(function(data, status, jqxhr) {
-                if ($(this.container).attr('data-infinite-serial') != this.serial) {
+                if ($container.attr('data-infinite-serial') != this.serial) {
                     // A newer request is already in progress.
                     return;
                 }
-                $(this.container).find(".spinner").detach();
-                $(this.container).append(data.content);
-                $(this.container).attr('data-infinite-content-href', data.next_page_href);
+                $container.find(".spinner").detach();
+                $container.append(data.content);
+                $container.attr('data-infinite-content-href', data.next_page_href);
             });
-    }
+     }
 }
+
 $(document).
     on('click', 'div.infinite-retry button', function() {
         var $retry_div = $(this).closest('.infinite-retry');
@@ -97,13 +101,16 @@ $(document).
     }).
     on('ready ajax:complete', function() {
         $('[data-infinite-scroller]').each(function() {
+            if ($(this).hasClass('infinite-scroller-ready'))
+                return;
+            $(this).addClass('infinite-scroller-ready');
+
             var $scroller = $($(this).attr('data-infinite-scroller'));
             if (!$scroller.hasClass('smart-scroll') &&
                 'scroll' != $scroller.css('overflow-y'))
                 $scroller = $(window);
             $scroller.
                 addClass('infinite-scroller').
-                data('infinite-container', this).
-                on('scroll', maybe_load_more_content);
+                on('scroll', { container: this }, maybe_load_more_content);
         });
     });