Merge pull request TryGhost#4765 from martinnormark/master

Load next page if scrollHeight <= clientHeight
elitelinux · Jan 12, 2015 · e6305e8 · e6305e8
2 parents 3052f60 + 3faf4de
commit e6305e8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/client/mixins/pagination-view-infinite-scroll.js b/core/client/mixins/pagination-view-infinite-scroll.js
@@ -22,9 +22,14 @@ var PaginationViewInfiniteScrollMixin = Ember.Mixin.create({
      * Bind to the scroll event once the element is in the DOM
      */
     attachCheckScroll: function () {
-        var el = this.$();
+        var el = this.$(),
+            controller = this.get('controller');
 
         el.on('scroll', Ember.run.bind(this, this.checkScroll));
+
+        if (this.element.scrollHeight <= this.element.clientHeight) {
+            controller.send('loadNextPage');
+        }
     }.on('didInsertElement'),
 
     /**