Fixing pagination

BKWLD · Dec 13, 2017 · 01f4b0d · 01f4b0d
1 parent 8cffa39
commit 01f4b0d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 25 deletions.
diff --git a/classes/Markup/UrlWindow.php b/classes/Markup/UrlWindow.php
@@ -17,18 +17,6 @@ class UrlWindow extends LaravelUrlWindow {
      */
     protected $edge_count = 2;
 
-    /**
-     * Set edge count
-     *
-     * @param  int  $edge_count
-     * @return $this
-     */
-    public function setEdgeCount($edge_count)
-    {
-        $this->edge_count = $edge_count;
-        return $this;
-    }
-
     /**
      * Get the slider of URLs when too close to beginning of window.
      *
@@ -71,7 +59,7 @@ protected function getSliderTooCloseToEnding($window)
      */
     public function getStart()
     {
-        return $this->paginator->getUrlRange(1, $this->edge_count);
+        return false;
     }
 
     /**
@@ -81,10 +69,7 @@ public function getStart()
      */
     public function getFinish()
     {
-        return $this->paginator->getUrlRange(
-            $this->lastPage() - $this->edge_count + 1,
-            $this->lastPage()
-        );
+        return false;
     }
 
 }
diff --git a/views/shared/pagination/desktop.blade.php b/views/shared/pagination/desktop.blade.php
@@ -2,19 +2,16 @@
 use Bkwld\Decoy\Markup\UrlWindow;
 
 // Make a smaller window
-$window = new UrlWindow($paginator);
-$window->setEdgeCount(0);
-$window = $window->get(3);
+$window = (new UrlWindow($paginator))->get(3);
 
 // Add dots to the window
 $elements = [
     $window['first'],
     is_array($window['slider']) ? '...' : null,
     $window['slider'],
-    is_array($window['last']) ? '...' : null,
+    is_array($window['slider']) ? '...' : null,
     $window['last'],
 ];
-$elements = array_filter($elements);
 
 ?>
 @if ($paginator->hasPages())

diff --git a/views/shared/pagination/mobile.blade.php b/views/shared/pagination/mobile.blade.php
@@ -2,9 +2,16 @@
 use Bkwld\Decoy\Markup\UrlWindow;
 
 // Make a smaller window
-$window = new UrlWindow($paginator);
-$window->setEdgeCount(0);
-$elements = array_filter($window->get(1));
+$window = (new UrlWindow($paginator))->get(1);
+
+// Add dots to the window
+$elements = [
+    $window['first'],
+    is_array($window['slider']) ? '...' : null,
+    $window['slider'],
+    is_array($window['slider']) ? '...' : null,
+    $window['last'],
+];
 
 ?>
 @if ($paginator->hasPages())