fixed limit calculation for last page query

heimrichhannot · Sep 26, 2018 · 633c0f6 · 633c0f6
1 parent eecb81c
commit 633c0f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Lists/DefaultList.php b/src/Lists/DefaultList.php
@@ -352,10 +352,11 @@ public function splitResults($offset, $total, $limit, $randomSeed = null): ?arra
             // Set limit and offset
             $limit = $listConfig->perPage;
             $offset += (max($page, 1) - 1) * $listConfig->perPage;
+            $skip = (int) $listConfig->skipFirst;
 
             // Overall limit
-            if ($offset + $limit > $offsettedTotal) {
-                $limit = $offsettedTotal - $offset;
+            if ($offset + $limit > $offsettedTotal + $skip) {
+                $limit = $offsettedTotal + $skip - $offset;
             }
 
             // Add the pagination menu

diff --git a/src/Resources/public/js/jquery.list-bundle.es6.js b/src/Resources/public/js/jquery.list-bundle.es6.js
@@ -10,6 +10,7 @@ let jQuery = require('jquery');
             $('.huh-list .ajax-pagination').each(function() {
                 import(/* webpackChunkName: "jscroll" */ 'jscroll').then(() =>
                 {
+                    let event = new Event('huh_list_pagination_loaded');
                     let $list = $(this).closest('.huh-list'),
                         $items = $list.find('.items'),
                         $wrapper = $list.find('.wrapper'),
@@ -74,6 +75,8 @@ let jQuery = require('jquery');
                                         {
                                             $item.addClass('last');
                                         }
+
+                                        $items[0].dispatchEvent(event);
                                     });
 
                                     $jscrollAdded.find('.ajax-pagination').appendTo($jscrollAdded.closest('.jscroll-inner'));