pagy 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ae2dcfec4f4aefaa0a2531b5abe5e0d18b92a835edf6549251c0073ce2f38f
-  data.tar.gz: 295ca05e50dc171da7c184d7d3e8dd9e3b7eaed1cf7387959471a3f758f6d169
+  metadata.gz: 48e9fa30f5123b3b985a58c0f20e00803b8708662d25e4b8116f786264adf382
+  data.tar.gz: fd51c8bf8bb897c01382459c4ab1a6baf3e28c7c9437213652382cbf5d01b8f8
 SHA512:
-  metadata.gz: d96430c17d8936a27942e3da7c0fbcff4d80372afd1f99b7a0c12b4ed5eb694aa1921404d31b77889078dc0fc59b4bbc5bfb0e4a6c418f3ae50837436bc17262
-  data.tar.gz: d7349c4e47d8b33cdadea01168d8a122ef36c6283164cf895dbcf197aca0f07c44437abce7e7d72b29d358f4d95b80586157d5bd5eeb4515e32b7001031329b8
+  metadata.gz: 073dd75676b37ba14baaccd30a58ce008e8d32dd8e1dfd8508bc02abf0f1d85bfe8a503a4790b4157cd8a36f3e8b1c89284ae3d83c0ea8cb6565e5e32a74985d
+  data.tar.gz: 449da76a99d14327a89fcc30fad843dc5581c8225fab8c5678aa72f9888b160ebbd09d6c1b6946d8bcd1002267803a72b97a28de7797ac1a0be28ece704475f6

data/lib/config/pagy.rb

@@ -1,10 +1,34 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.3.0)
+# Pagy initializer file (4.4.0)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 
 
+# Pagy Variables
+# See https://ddnexus.github.io/pagy/api/pagy#variables
+# All the Pagy::VARS are set for all the Pagy instances but can be overridden
+# per instance by just passing them to Pagy.new or the #pagy controller method
+
+
+# Instance variables
+# See https://ddnexus.github.io/pagy/api/pagy#instance-variables
+# Pagy::VARS[:page]   = 1                                  # default
+# Pagy::VARS[:items]  = 20                                 # default
+# Pagy::VARS[:outset] = 0                                  # default
+
+
+# Other Variables
+# See https://ddnexus.github.io/pagy/api/pagy#other-variables
+# Pagy::VARS[:size]       = [1,4,4,1]                       # default
+# Pagy::VARS[:page_param] = :page                           # default
+# Pagy::VARS[:params]     = {}                              # default
+# Pagy::VARS[:fragment]   = '#fragment'                     # example
+# Pagy::VARS[:link_extra] = 'data-remote="true"'            # example
+# Pagy::VARS[:i18n_key]   = 'pagy.item_name'                # default
+# Pagy::VARS[:cycle]      = true                            # example
+
+
 # Extras
 # See https://ddnexus.github.io/pagy/extras
 
@@ -18,7 +42,6 @@
 # Countless extra: Paginate without any count, saving one query per rendering
 # See https://ddnexus.github.io/pagy/extras/countless
 # require 'pagy/extras/countless'
-# Pagy::VARS[:cycle] = false    # default
 
 # Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects
 # See https://ddnexus.github.io/pagy/extras/elasticsearch_rails
@@ -87,6 +110,8 @@
 # require 'pagy/extras/items'
 # Pagy::VARS[:items_param] = :items    # default
 # Pagy::VARS[:max_items]   = 100       # default
+# set to false if you want to make :enable_items_extra an opt-in variable
+# Pagy::VARS[:enable_items_extra] = false    # default true
 
 # Overflow extra: Allow for easy handling of overflowing pages
 # See https://ddnexus.github.io/pagy/extras/overflow
@@ -105,28 +130,8 @@
 # See https://ddnexus.github.io/pagy/extras/trim
 # require 'pagy/extras/trim'
 # after requiring it will trim by default
-# set to false if you want to make :trim an opt-in variable
-# Pagy::VARS[:trim] = true # default
-
-
-# Pagy Variables
-# See https://ddnexus.github.io/pagy/api/pagy#variables
-# All the Pagy::VARS are set for all the Pagy instances but can be overridden
-# per instance by just passing them to Pagy.new or the #pagy controller method
-
-
-# Instance variables
-# See https://ddnexus.github.io/pagy/api/pagy#instance-variables
-# Pagy::VARS[:items] = 20                                   # default
-
-
-# Other Variables
-# See https://ddnexus.github.io/pagy/api/pagy#other-variables
-# Pagy::VARS[:size]       = [1,4,4,1]                       # default
-# Pagy::VARS[:page_param] = :page                           # default
-# Pagy::VARS[:params]     = {}                              # default
-# Pagy::VARS[:anchor]     = '#anchor'                       # example
-# Pagy::VARS[:link_extra] = 'data-remote="true"'            # example
+# set to false if you want to make :enable_trim_extra an opt-in variable
+# Pagy::VARS[:enable_trim_extra] = false # default true
 
 
 # Rails

data/lib/javascripts/pagy.js

@@ -2,34 +2,35 @@
 
 function Pagy(){}
 
-Pagy.version = '4.3.0';
+Pagy.version = '4.4.0';
 
-Pagy.init = function(arg){
+Pagy.timeout = 100;
+
+Pagy.timeoutId = 0;
+
+Pagy.init = function(arg) {
               var target   = arg instanceof Event || arg === undefined ? document : arg,
                   jsonTags = target.getElementsByClassName('pagy-json');
-              if (target === document) { // reset resize-listeners on page load (#163)
-                for (var id in Pagy.navResizeListeners) { window.removeEventListener('resize', Pagy.navResizeListeners[id], true) }
-                Pagy.navResizeListeners = {};
-              }
               for (var i = 0, len = jsonTags.length; i < len; i++) {
-                var args = JSON.parse(jsonTags[i].innerHTML);
-                Pagy[args.shift()].apply(null, args);
+                var args  = JSON.parse(jsonTags[i].innerHTML),
+                    fname = args.shift();
+                args.unshift(jsonTags[i].previousSibling);
+                Pagy[fname].apply(null, args);
               }
-            };
+            }
 
-Pagy.nav = function(id, tags, sequels, param){
-             var pagyEl    = document.getElementById(id),
-                 lastWidth = undefined,
+Pagy.nav = function(pagyEl, tags, sequels, param) {
+             var lastWidth = undefined,
                  timeoutId = 0,
                  pageREg   = new RegExp(/__pagy_page__/g),
                  widths    = [],
-                 rendering = function(){ clearTimeout(timeoutId); timeoutId = setTimeout(pagyEl.render, 150) };  // suppress rapid firing rendering
+                 wait      = function() { clearTimeout(timeoutId); timeoutId = setTimeout(pagyEl.render, Pagy.timeout) };
 
              for (var width in sequels) { widths.push(parseInt(width)) } // fine with sequels structure
-             widths.sort(function(a, b){return b-a});
+             widths.sort(function(a, b) { return b - a });
 
-             pagyEl.render = function(){
-                               if (this.parentElement.clientWidth === 0) { rendering() }
+             pagyEl.render = function() {
+                               if (this.parentElement.clientWidth === 0) { return wait() } // not ready yet
                                var width, i, len;
                                for (i = 0, len = widths.length; i < len; i++) {
                                  if (this.parentElement.clientWidth > widths[i]) { width = widths[i]; break }
@@ -50,57 +51,60 @@ Pagy.nav = function(id, tags, sequels, param){
                                  lastWidth = width;
                                }
                              }.bind(pagyEl);
-
-             if (widths.length > 1) {
-               // refresh the window resize listener (avoiding rendering multiple times)
-               window.removeEventListener('resize', Pagy.navResizeListeners[id], true);   // needed for AJAX init
-               window.addEventListener('resize', rendering, true);
-               Pagy.navResizeListeners[id] = rendering;
-             }
              pagyEl.render();
-           };
+           }
 
-Pagy.combo_nav = function(id, page, link, param){
-                   var pagyEl = document.getElementById(id),
-                       input  = pagyEl.getElementsByTagName('input')[0],
-                       go     = function(){
-                                  if (page !== input.value) {
-                                    var html = link.replace(/__pagy_page__/, input.value);
-                                    if (typeof(param) === 'string' && input.value === '1') { html = Pagy.trim(html, param) }
-                                    pagyEl.insertAdjacentHTML('afterbegin', html);
-                                    pagyEl.getElementsByTagName('a')[0].click();
-                                  }
-                                };
+Pagy.combo_nav = function(pagyEl, page, link, param) {
+                   var input = pagyEl.getElementsByTagName('input')[0],
+                       go    = function() {
+                                 if (page !== input.value) {
+                                   var html = link.replace(/__pagy_page__/, input.value);
+                                   if (typeof (param) === 'string' && input.value === '1') { html = Pagy.trim(html, param) }
+                                   pagyEl.insertAdjacentHTML('afterbegin', html);
+                                   pagyEl.getElementsByTagName('a')[0].click();
+                                 }
+                               };
                    Pagy.addInputEventListeners(input, go);
-                 };
+                 }
 
-Pagy.items_selector = function(id, from, link, param){
-                        var pagyEl  = document.getElementById(id),
-                            input   = pagyEl.getElementsByTagName('input')[0],
+Pagy.items_selector = function(pagyEl, from, link, param) {
+                        var input   = pagyEl.getElementsByTagName('input')[0],
                             current = input.value,
-                            go      = function(){
-                                        var items = input.value;
-                                        if (current !== items) {
-                                          var page = Math.max(Math.ceil(from / items),1),
-                                              html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, items);
-                                          if (typeof(param) === 'string' && page === 1){ html = Pagy.trim(html, param) }
-                                          pagyEl.insertAdjacentHTML('afterbegin', html);
-                                          pagyEl.getElementsByTagName('a')[0].click();
-                                        }
-                                      };
+                            go      = function() {
+                              var items = input.value;
+                              if (current !== items) {
+                                var page = Math.max(Math.ceil(from / items), 1),
+                                    html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, items);
+                                if (typeof (param) === 'string' && page === 1) { html = Pagy.trim(html, param) }
+                                pagyEl.insertAdjacentHTML('afterbegin', html);
+                                pagyEl.getElementsByTagName('a')[0].click();
+                              }
+                            };
                         Pagy.addInputEventListeners(input, go);
-                      };
+                      }
 
-Pagy.addInputEventListeners = function(input, handler){
+Pagy.addInputEventListeners = function(input, handler) {
                                 // select the content on click: easier for typing a number
-                                input.addEventListener('click', function(){ this.select() });
+                                input.addEventListener('click', function() { this.select() });
                                 // go when the input looses focus
                                 input.addEventListener('focusout', handler);
                                 // … and when pressing enter inside the input
-                                input.addEventListener('keyup', function(e){ if (e.which === 13) handler() }.bind(this));
-                              };
+                                input.addEventListener('keyup', function(e) { if (e.which === 13) {handler()} }.bind(this));
+                              }
 
-Pagy.trim = function(html, param){
+Pagy.trim = function(html, param) {
               var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&');
               return html.replace(re, '');
-            };
+            }
+
+Pagy.renderNjs = function() {
+                   var navs = document.getElementsByClassName('pagy-njs');
+                   for (var i = 0, len = navs.length; i < len; i++) { navs[i].render() }
+                 }
+
+Pagy.wait = function() {
+              clearTimeout(Pagy.timeoutId);
+              Pagy.timeoutId = setTimeout(Pagy.renderNjs, Pagy.timeout);
+            }
+
+window.addEventListener('resize', Pagy.wait, true);

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # main class
 class Pagy
-  VERSION = '4.3.0'
+  VERSION = '4.4.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -14,7 +14,7 @@ class Pagy
 
   # default vars
   VARS = { page: 1, items: 20, outset: 0, size: [1, 4, 4, 1], page_param: :page,              # rubocop:disable Style/MutableConstant
-           params: {}, anchor: '', link_extra: '', i18n_key: 'pagy.item_name', cycle: false }
+           params: {}, fragment: '', link_extra: '', i18n_key: 'pagy.item_name', cycle: false }
 
   attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next
 
@@ -22,7 +22,8 @@ class Pagy
 
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
-    @vars = VARS.merge( vars.delete_if{|_,v| v.nil? || v == '' } )
+    @vars = VARS.merge( vars.delete_if{|k,v| VARS.key?(k) && (v.nil? || v == '') } )
+    @vars[:fragment] = deprecated_var(:anchor, @vars[:anchor], :fragment, @vars[:fragment]) if @vars[:anchor]
 
     INSTANCE_VARS_MIN.each do |name,min|
       raise VariableError.new(self), "expected :#{name} >= #{min}; got #{@vars[name].inspect}" \
@@ -69,6 +70,7 @@ class Pagy
 
 end
 
+require 'pagy/deprecation'
 require 'pagy/backend'
 require 'pagy/frontend'
 require 'pagy/exceptions'

data/lib/pagy/backend.rb

@@ -19,6 +19,7 @@ class Pagy
 
     # Sub-method called only by #pagy: here for easy customization of variables by overriding
     def pagy_get_vars(collection, vars)
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
       vars[:count] ||= (c = collection.count(:all)).is_a?(Hash) ? c.size : c
       vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
       vars

data/lib/pagy/deprecation.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+class Pagy
+  class << self
+
+    # deprecated variables
+    def deprecated_var(var, val, new_var, new_val)
+      value = new_val || val
+      Warning.warn %([PAGY WARNING] deprecated use of `#{var}` var will not be supported in 5.0! Use `#{new_var}: #{value.inspect}` instead.)
+      value
+    end
+
+    # deprecated pagy_url_for argument order
+    def deprecated_order(pagy, page)
+      Warning.warn '[PAGY WARNING] inverted use of pagy/page in pagy_url_for will not be supported in 5.0! Use pagy_url_for(pagy, page) instead.'
+      [page, pagy]
+    end
+
+
+    # deprecated posiitioal arguments
+    def deprecated_arg(arg, val, new_key, new_val)
+      value = new_val || val  # we use the new_val if present
+      Warning.warn %([PAGY WARNING] deprecated use of positional `#{arg}` arg will not be supported in 5.0! Use only the keyword arg `#{new_key}: #{value.inspect}` instead.)
+      value
+    end
+
+  end
+end

data/lib/pagy/extras/arel.rb

@@ -11,6 +11,7 @@ class Pagy
     end
 
     def pagy_arel_get_vars(collection, vars)
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
       vars[:count] ||= pagy_arel_count(collection)
       vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
       vars

data/lib/pagy/extras/array.rb

@@ -14,6 +14,7 @@ class Pagy
 
     # Sub-method called only by #pagy_array: here for easy customization of variables by overriding
     def pagy_array_get_vars(array, vars)
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
       vars[:count] ||= array.size
       vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
       vars

data/lib/pagy/extras/bootstrap.rb

@@ -7,10 +7,11 @@ class Pagy
   module Frontend
 
     # Pagination for bootstrap: it returns the html with the series of links to the pages
-    def pagy_bootstrap_nav(pagy)
-      link = pagy_link_proc(pagy, 'class="page-link"')
+    def pagy_bootstrap_nav(pagy, pagy_id: nil, link_extra: '')
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
 
-      html = +%(<nav class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">)
       html << pagy_bootstrap_prev_html(pagy, link)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
@@ -24,26 +25,30 @@ class Pagy
     end
 
     # Javascript pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_bootstrap_nav_js(pagy, id=pagy_id)
-      link = pagy_link_proc(pagy, 'class="page-link"')
+    def pagy_bootstrap_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
+      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
       tags = { 'before' => %(<ul class="pagination">#{pagy_bootstrap_prev_html pagy, link}),
                'link'   => %(<li class="page-item">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="page-item active">#{mark}</li>),
                'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
 
-      html = %(<nav id="#{id}" class="pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_bootstrap_combo_nav_js(pagy, id=pagy_id)
-      link    = pagy_link_proc(pagy)
+    def pagy_bootstrap_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
+      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+      p_id    = %( id="#{pagy_id}") if pagy_id
+      link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
       input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<nav id="#{id}" class="pagy-bootstrap-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="btn-group" role="group">#{
+      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="btn-group" role="group">#{
           if (p_prev = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
           else
@@ -56,7 +61,7 @@ class Pagy
             %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next' }</a>)
           end
       }</div></nav>#{
-          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
+          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
       })
     end
 

data/lib/pagy/extras/bulma.rb

@@ -7,10 +7,11 @@ class Pagy
   module Frontend
 
     # Pagination for Bulma: it returns the html with the series of links to the pages
-    def pagy_bulma_nav(pagy)
-      link = pagy_link_proc(pagy)
+    def pagy_bulma_nav(pagy, pagy_id: nil, link_extra: '')
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: link_extra)
 
-      html = +%(<nav class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">)
       html << pagy_bulma_prev_next_html(pagy, link)
       html << %(<ul class="pagination-list">)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
@@ -23,26 +24,30 @@ class Pagy
       html << %(</ul></nav>)
     end
 
-    def pagy_bulma_nav_js(pagy, id=pagy_id)
-      link = pagy_link_proc(pagy)
+    def pagy_bulma_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
+      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: link_extra)
       tags = { 'before' => %(#{pagy_bulma_prev_next_html(pagy, link)}<ul class="pagination-list">),
                'link'   => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}")}</li>),
                'active' => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link is-current" aria-current="page" aria-label="page #{PAGE_PLACEHOLDER}")}</li>),
                'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap' }</span></li>),
                'after'  => '</ul>' }
 
-      html = %(<nav id="#{id}" class="pagy-bulma-nav-js pagination is-centered" role="navigation" aria-label="pagination"></nav>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" role="navigation" aria-label="pagination"></nav>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     end
 
     # Javascript combo pagination for Bulma: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_bulma_combo_nav_js(pagy, id=pagy_id)
-      link    = pagy_link_proc(pagy)
+    def pagy_bulma_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
+      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+      p_id    = %( id="#{pagy_id}") if pagy_id
+      link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
       input   = %(<input class="input" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem; margin:0 0.3rem;">)
 
-      %(<nav id="#{id}" class="pagy-bulma-combo-nav-js" role="navigation" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group">#{
+      %(<nav#{p_id} class="pagy-bulma-combo-nav-js" role="navigation" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group">#{
           if (p_prev  = pagy.prev)
             %(<p class="control">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"'}</p>)
           else
@@ -55,7 +60,7 @@ class Pagy
             %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
           end
       }</div></nav>#{
-         pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
+         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
       })
     end