[ARVADOS] updated: 63c77731e44e94cc3866a38bca08fe2d44d8bc05

[git at public.curoverse.com]

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

       via  63c77731e44e94cc3866a38bca08fe2d44d8bc05 (commit)
      from  64e95630b452d3dff9e2575b452ec9a1cad6f47b (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 63c77731e44e94cc3866a38bca08fe2d44d8bc05
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jun 13 16:06:48 2014 -0400

    Fix infinite scroll in chooser. refs #2872

diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 3e15c9d..64a90e2 100644
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -42,7 +42,8 @@ $(document).
     on('ready ajax:complete', function() {
         $('[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').

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


hooks/post-receive
--