Commit a906c00f

mo <mokha@cisco.com>
2017-09-02 22:16:53
replace more-button selector with data-infinite-scroll.
master
1 parent d7eb1b1
Changed files (3)
app
assets
javascripts
infrastructure
infinite_scroll.js.coffee
views
cakes
_index.html.erb
profiles
_index.html.erb
app/assets/javascripts/infrastructure/infinite_scroll.js.coffee
@@ -4,5 +4,8 @@ class CakeSide.InfiniteScroll extends CakeSide.Behaviour
   @on "scroll"
 
   execute: ->
+    $moreButton = $('[data-infinite-scroll]')
+    return if $moreButton.length == 0
+
     if $(window).scrollTop() >= ($(document).height() - $(window).height())*0.8
-      $('.more-button').trigger('click')
+      $moreButton.trigger('click')
app/views/cakes/_index.html.erb
@@ -13,5 +13,5 @@
   <% end %>
 </div>
 <div id='more-button-row' class="row">
-  <%= link_to_next_page @cakes, 'More...', params: { cache: false, sort: params[:sort], q: params[:q] }, remote: true, class: 'btn pull-right more-button hidden', data: { disable_with: 'loading...' } %>
+  <%= link_to_next_page @cakes, 'More...', params: { cache: false, sort: params[:sort], q: params[:q] }, remote: true, class: 'btn pull-right hidden', data: { disable_with: 'loading...', infinite_scroll: true } %>
 </div>
app/views/profiles/_index.html.erb
@@ -12,5 +12,5 @@
   <% end %>
 </div>
 <div id='more-button-row' class="row">
-  <%= link_to_next_page @profiles, 'More...', params: { cache: false }, remote: true, class: 'more-button hidden', data: { disable_with: 'loading...' } %>
+  <%= link_to_next_page @profiles, 'More...', params: { cache: false }, remote: true, class: 'hidden', data: { disable_with: 'loading...', infinite_scroll: true } %>
 </div>