Merge branch 'master' into origin-2883-job-log-viewer

[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 48b8136812558ebc6e12c7641a8217ade8d010a2..64a90e2255d117ba7416e5d362269e53aba5ee70 100644 (file)
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -2,9 +2,11 @@ function maybe_load_more_content() {
     var scroller = this;        // element with scroll bars
     var container;              // element that receives new content
     var src;                    // url for retrieving content
+    var scrollHeight;
+    scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight;
     if ($(scroller).scrollTop() + $(scroller).height()
         >
-        scroller.scrollHeight - 50) {
+        scrollHeight - 50) {
         container = $(this).data('infinite-container');
         src = $(container).attr('data-infinite-content-href');
         if (!src)
@@ -39,7 +41,11 @@ function maybe_load_more_content() {
 $(document).
     on('ready ajax:complete', function() {
         $('[data-infinite-scroller]').each(function() {
-            $($(this).attr('data-infinite-scroller')).
+            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);