show reached end message only if loaded items before

niklasnatter · Oct 12, 2015 · 2500bb0 · 2500bb0
1 parent 52f3a2a
commit 2500bb0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/dist/husky.js b/dist/husky.js
@@ -32410,13 +32410,16 @@ define('husky_components/datagrid/decorators/infinite-scroll-pagination',[],func
 
                 this.sandbox.util.load(this.datagrid.data.links.next.href).then(function(data) {
                     this.updateDatagrid(data);
+                    this.$paginationContainer.data('showReachedEnd', true);
                     this.$loader.css('opacity', '0');
 
-                    promise.resolve(true);
+                    promise.resolve();
                 }.bind(this))
             } else {
-                this.$paginationContainer.addClass('reached-end');
-                promise.resolve(false);
+                if (!!this.$paginationContainer.data('showReachedEnd')) {
+                    this.$paginationContainer.addClass('reached-end');
+                }
+                promise.resolve();
             }
 
             return promise;

diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/husky_components/datagrid/decorators/infinite-scroll-pagination.js b/husky_components/datagrid/decorators/infinite-scroll-pagination.js
@@ -162,13 +162,16 @@ define(function() {
 
                 this.sandbox.util.load(this.datagrid.data.links.next.href).then(function(data) {
                     this.updateDatagrid(data);
+                    this.$paginationContainer.data('showReachedEnd', true);
                     this.$loader.css('opacity', '0');
 
-                    promise.resolve(true);
+                    promise.resolve();
                 }.bind(this))
             } else {
-                this.$paginationContainer.addClass('reached-end');
-                promise.resolve(false);
+                if (!!this.$paginationContainer.data('showReachedEnd')) {
+                    this.$paginationContainer.addClass('reached-end');
+                }
+                promise.resolve();
             }
 
             return promise;