[ARVADOS] updated: 00a92f1bc74b503af5c6f17a3b69992e750fce8f

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/infinite_scroll.js      | 15 ++++----
 .../api/config/environments/production.rb.example  |  3 +-
 services/keep/src/keep/keep.go                     | 45 +++++++++++++---------
 services/keep/src/keep/keep_test.go                |  8 ++--
 4 files changed, 40 insertions(+), 31 deletions(-)

       via  00a92f1bc74b503af5c6f17a3b69992e750fce8f (commit)
       via  ffa64c065ac8b28849395cf3e89fe93814252473 (commit)
       via  b501fc456ccfe1d4b36107b8b10f43c91fa841b2 (commit)
       via  3cb494b4438c9b59d2ac6b233dccb0d92c4982e8 (commit)
       via  4499ee93f46d6bcc3918ee793e2cb31dfa0f1b04 (commit)
       via  3a1881893ea120db630121357bc05d945119792b (commit)
       via  ca767f4ed048496a03355d1c695140b6a4ff56ac (commit)
       via  6fc9da7df8e24cb52aed7ec66c4ca0958b0daa41 (commit)
      from  cb832ae39672fe1721e3c531374bdbaa4f24161a (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 00a92f1bc74b503af5c6f17a3b69992e750fce8f
Merge: ffa64c0 b501fc4
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 17 07:05:00 2014 -0400

    Merge branch 'master' into 3140-project-content-tabs


commit ffa64c065ac8b28849395cf3e89fe93814252473
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 17 07:03:38 2014 -0400

    3140: apply infinite scrolling if the container is visible, when working with multiple containers in window.

diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 846f43c..1f9997e 100644
--- 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;

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


hooks/post-receive
--