[ARVADOS] updated: ab6840d138c3ce57341df76a926baa83194a6d1e

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/infinite_scroll.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  ab6840d138c3ce57341df76a926baa83194a6d1e (commit)
      from  3233ded01a1478b66828dafdd2abd8bad941b197 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ab6840d138c3ce57341df76a926baa83194a6d1e
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Jan 6 09:23:17 2015 -0500

    4836: Squash last commit based on Tom feedback.

diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index e97c9fc..d7ad41a 100644
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -18,7 +18,7 @@ function maybe_load_more_content(event) {
                             $container.attr('data-infinite-content-href'));
         }
         src = $container.attr('data-infinite-content-href');
-        if (!src)
+        if (!src || !$container.is(':visible'))
             // Finished
             return;
 
@@ -225,6 +225,10 @@ $(document).
                 trigger('scroll');
         });
     }).
+    on('shown.bs.tab', 'a[data-toggle="tab"]', function(event) {
+        $(event.target.getAttribute('href') + ' [data-infinite-scroller]').
+            trigger('scroll');
+    }).
     on('click', 'th[data-sort-order]', function() {
         var direction = $(this).data('sort-order-direction');
         // reverse the current direction, or do ascending if none

-----------------------------------------------------------------------


hooks/post-receive
--