pagy 4.2.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1893ce66c2ad5ccb5e1b55340873135bf1174f6876a7fe9987bf3d7b11c8b93d
-  data.tar.gz: 15ec7c5615cc40f2fc854f18577632d99f0ec83134f432a2526ca51c1c579a2a
+  metadata.gz: ef235bc480391503c4c4c9c0af67f8bf10f62aad86270fc0ae67e1bdd76a0044
+  data.tar.gz: 18c74230a1e88d4875340b4bff63c181fb95998e63ebf83aac51016e5d16bb68
 SHA512:
-  metadata.gz: 3b0a30aa314e2abc44dbad8a89352cd640b3ff81979b31436b8911920df344eef2a43cd622ba2921e9ef088a3059611e7e3ccab05f1e07ab7e3bdaefd72ecd58
-  data.tar.gz: 318953ee34f26d5f89f59417b2b02edda38608ada3946241633513167c1b5c5e209a8b474dfb8c1f028381283ba20cf367b5e2b7e9ad7ad95ca22af86d94730d
+  metadata.gz: add32ab56092596d562d5e90abfeb87a4c66eb2e4c1f0d3b923e0ffc53c20b03a4edba020ebb8a15efd5e089a9d59b059d0bc4f6496c8836eaa5908e4bb2de68
+  data.tar.gz: 268a59ed232635bcf2e41140380b2751bec2bb1ddba2a388ff095f5d8aceda6b455474f46cf069569a83f544c7c983358e9723bdd14c0160ae1b08ba3197be9b

data/lib/config/pagy.rb

@@ -1,10 +1,34 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.2.0)
+# Pagy initializer file (4.6.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
@@ -104,27 +129,9 @@
 # Trim extra: Remove the page=1 param from links
 # See https://ddnexus.github.io/pagy/extras/trim
 # require 'pagy/extras/trim'
-
-
-
-# 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
+# after requiring it will trim by default
+# 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,105 +2,116 @@
 
 function Pagy(){}
 
-Pagy.version = '4.2.0';
+Pagy.version = '4.6.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);
-              }
-            };
+Pagy.delay = 100
 
-Pagy.nav = function(id, tags, sequels, param){
-             var pagyEl    = document.getElementById(id),
-                 lastWidth = undefined,
-                 timeoutId = 0,
-                 pageREg   = new RegExp(/__pagy_page__/g),
-                 widths    = [],
-                 rendering = function(){ clearTimeout(timeoutId); timeoutId = setTimeout(pagyEl.render, 150) };  // suppress rapid firing rendering
+Pagy.init =
+  function(arg) {
+    var target   = arg instanceof Event || arg === undefined ? document : arg,
+        jsonTags = target.getElementsByClassName('pagy-json')
+    for (var i = 0, len = jsonTags.length; i < len; i++) {
+      var args  = JSON.parse(jsonTags[i].innerHTML),
+          fname = args.shift()
+      args.unshift(jsonTags[i].previousSibling)
+      Pagy[fname].apply(null, args)
+    }
+  }
 
-             for (var width in sequels) { widths.push(parseInt(width)) } // fine with sequels structure
-             widths.sort(function(a, b){return b-a});
+Pagy.nav =
+  function(pagyEl, tags, sequels, trimParam) {
+    var lastWidth,
+        pageREg = new RegExp(/__pagy_page__/g),
+        widths  = []
+    for (var width in sequels) {
+      if (sequels.hasOwnProperty(width)) { widths.push(parseInt(width, 10)) }
+    }
+    widths.sort(function(a, b) { return b - a })
 
-             pagyEl.render = function(){
-                               if (this.parentElement.clientWidth === 0) { rendering() }
-                               var width, i, len;
-                               for (i = 0, len = widths.length; i < len; i++) {
-                                 if (this.parentElement.clientWidth > widths[i]) { width = widths[i]; break }
-                               }
-                               if (width !== lastWidth) {
-                                 var html   = tags.before,
-                                     series = sequels[width];
-                                 for (i = 0, len = series.length; i < len; i++) {
-                                   var item = series[i];
-                                   if (typeof(param) === 'string' && item === 1) { html += Pagy.trim(tags.link.replace(pageREg, item), param) }
-                                   else if (typeof(item) === 'number') { html += tags.link.replace(pageREg, item) }
-                                   else if (item === 'gap') { html += tags.gap }
-                                   else if (typeof(item) === 'string') { html += tags.active.replace(pageREg, item) }
-                                 }
-                                 html += tags.after;
-                                 this.innerHTML = '';
-                                 this.insertAdjacentHTML('afterbegin', html);
-                                 lastWidth = width;
-                               }
-                             }.bind(pagyEl);
+    pagyEl.render =
+      function() {
+        var width, i, len
+        for (i = 0, len = widths.length; i < len; i++) {
+          if (this.parentElement.clientWidth > widths[i]) { width = widths[i]; break }
+        }
+        if (width !== lastWidth) {
+          var html   = tags.before,
+              series = sequels[width]
+          for (i = 0, len = series.length; i < len; i++) {
+            var item = series[i]
+            if (typeof(trimParam) === 'string' && item === 1) { html += Pagy.trim(tags.link.replace(pageREg, item), trimParam) }
+            else if (typeof(item) === 'number') { html += tags.link.replace(pageREg, item) }
+            else if (item === 'gap') { html += tags.gap }
+            else if (typeof(item) === 'string') { html += tags.active.replace(pageREg, item) }
+          }
+          html += tags.after
+          this.innerHTML = ''
+          this.insertAdjacentHTML('afterbegin', html)
+          lastWidth = width
+        }
+      }.bind(pagyEl)
+    pagyEl.render()
+ }
 
-             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(pagyEl, page, link, trimParam) {
+    var input  = pagyEl.getElementsByTagName('input')[0],
+        toPage =
+          function() {
+            if (page !== input.value) {
+              var html = link.replace(/__pagy_page__/, input.value)
+              if (typeof (trimParam) === 'string' && input.value === '1') { html = Pagy.trim(html, trimParam) }
+              pagyEl.insertAdjacentHTML('afterbegin', html)
+              pagyEl.getElementsByTagName('a')[0].click()
+            }
+          }
+    Pagy.addInputEventListeners(input, toPage)
+  }
 
-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.addInputEventListeners(input, go);
-                 };
+Pagy.items_selector =
+  function(pagyEl, from, link, param) {
+    var input   = pagyEl.getElementsByTagName('input')[0],
+        current = input.value,
+        toPage  =
+          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, toPage)
+  }
 
-Pagy.items_selector = function(id, from, link, param){
-                        var pagyEl  = document.getElementById(id),
-                            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();
-                                        }
-                                      };
-                        Pagy.addInputEventListeners(input, go);
-                      };
+Pagy.addInputEventListeners =
+  function(input, toPage) {
+    // select the content on click: easier for typing a number
+    input.addEventListener('click', function() { this.select() })
+    // toPage when the input looses focus
+    input.addEventListener('focusout', toPage)
+    // … and when pressing enter inside the input
+    input.addEventListener('keyup', function(e) { if (e.which === 13) {toPage()} }.bind(this))
+  }
 
-Pagy.addInputEventListeners = function(input, handler){
-                                // select the content on click: easier for typing a number
-                                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));
-                              };
+Pagy.trim =
+  function(html, param) {
+    var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&')
+    return html.replace(re, '')
+  }
 
-Pagy.trim = function(html, param){
-              var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&');
-              return html.replace(re, '');
-            };
+Pagy.renderNavs =
+  function() {
+    var navs = document.getElementsByClassName('pagy-njs')  // 'pagy-njs' is common to all *nav_js helpers
+    for (var i = 0, len = navs.length; i < len; i++) { navs[i].render() }
+  }
+
+Pagy.waitForMe =
+  function() {
+    if (typeof(Pagy.tid) === 'number') { clearTimeout(Pagy.tid) }
+    Pagy.tid = setTimeout(Pagy.renderNavs, Pagy.delay)
+  }
+
+window.addEventListener('resize', Pagy.waitForMe, true)

data/lib/locales/bg.yml

@@ -17,6 +17,6 @@ bg:
       single_page: "Показани са <b>%{count}</b> %{item_name}"
       multiple_pages: "Показани са %{item_name} <b>%{from}-%{to}</b> от <b>%{count}</b> общо"
 
-    combo_nav_js: "Страница %{page_input} от %{pages}"
+    combo_nav_js: "<label>Страница %{page_input}</label> от %{pages}"
 
-    items_selector_js: "Покажи %{items_input} %{item_name} на страница"
+    items_selector_js: "<label>Покажи %{items_input} %{item_name} на страница</label>"

data/lib/locales/bs.yml

@@ -19,6 +19,6 @@ bs:
       single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
       multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
 
-    combo_nav_js: "Stranica %{page_input} od %{pages}"
+    combo_nav_js: "<label>Stranica %{page_input}</label> od %{pages}"
 
-    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"
+    items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"

data/lib/locales/ca.yml

@@ -17,6 +17,6 @@ ca:
       single_page: "Mostrant <b>%{count}</b> %{item_name}"
       multiple_pages: "Mostrant %{item_name} <b>%{from}-%{to}</b> de <b>%{count}</b> en total"
 
-    combo_nav_js: "Pàgina %{page_input} de %{pages}"
+    combo_nav_js: "<label>Pàgina %{page_input}</label> de %{pages}"
 
-    items_selector_js: "Mostra %{items_input} %{item_name} per pàgina"
+    items_selector_js: "<label>Mostra %{items_input} %{item_name} per pàgina</label>"

data/lib/locales/cs.yml

@@ -17,6 +17,6 @@ cs:
       single_page: "Zobrazeno <b>%{count}</b> %{item_name}"
       multiple_pages: "Zobrazeno %{item_name} <b>%{from}-%{to}</b> z <b>%{count}</b> celkem"
 
-    combo_nav_js: "Strana %{page_input} z %{pages}"
+    combo_nav_js: "<label>Strana %{page_input}</label> z %{pages}"
 
-    items_selector_js: "Zobrazit %{items_input} %{item_name} na stránce"
+    items_selector_js: "<label>Zobrazit %{items_input} %{item_name} na stránce</label>"

data/lib/locales/da.yml

@@ -17,6 +17,6 @@ da:
       single_page: "Viser <b>%{count}</b> %{item_name}"
       multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> til <b>%{count}</b> totalt"
 
-    combo_nav_js: "Side %{page_input} of %{pages}"
+    combo_nav_js: "<label>Side %{page_input}</label> of %{pages}"
 
-    items_selector_js: "Antal %{items_input} %{item_name} per side"
+    items_selector_js: "<label>Antal %{items_input} %{item_name} per side</label>"

data/lib/locales/de.yml

@@ -17,6 +17,6 @@ de:
       single_page: "Zeige <b>%{count}</b> %{item_name}"
       multiple_pages: "Zeige %{item_name} <b>%{from}-%{to}</b> von <b>%{count}</b> gesamt"
 
-    combo_nav_js: "Seite %{page_input} von %{pages}"
+    combo_nav_js: "<label>Seite %{page_input}</label> von %{pages}"
 
-    items_selector_js: "Zeige %{items_input} %{item_name} pro Seite"
+    items_selector_js: "<label>Zeige %{items_input} %{item_name} pro Seite</label>"

data/lib/locales/en.yml

@@ -17,6 +17,6 @@ en:
       single_page: "Displaying <b>%{count}</b> %{item_name}"
       multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
 
-    combo_nav_js: "Page %{page_input} of %{pages}"
+    combo_nav_js: "<label>Page %{page_input}</label> of %{pages}"
 
-    items_selector_js: "Show %{items_input} %{item_name} per page"
+    items_selector_js: "<label>Show %{items_input} %{item_name} per page</label>"

data/lib/locales/es.yml

@@ -17,6 +17,6 @@ es:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
 
-    combo_nav_js: "Página %{page_input} de %{pages}"
+    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
 
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/fr.yml

@@ -17,6 +17,6 @@ fr:
       single_page: "Affichage de <b>%{count}</b> %{item_name}"
       multiple_pages: "Affichage des %{item_name} <b>%{from} à %{to}</b> sur <b>%{count}</b> au total"
 
-    combo_nav_js: "Page %{page_input} sur %{pages}"
+    combo_nav_js: "<label>Page %{page_input}</label> sur %{pages}"
 
-    items_selector_js: "Afficher %{items_input} %{item_name} par page"
+    items_selector_js: "<label>Afficher %{items_input} %{item_name} par page</label>"

data/lib/locales/hr.yml

@@ -19,6 +19,6 @@ hr:
       single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
       multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
 
-    combo_nav_js: "Stranica %{page_input} od %{pages}"
+    combo_nav_js: "<label>Stranica %{page_input}</label> od %{pages}"
 
-    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"
+    items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"

data/lib/locales/id.yml

@@ -15,6 +15,6 @@ id:
       single_page: "Menampilkan <b>%{count}</b> %{item_name}"
       multiple_pages: "Menampilkan %{item_name} <b>%{from}-%{to}</b> dari total <b>%{count}</b>"
 
-    combo_nav_js: "Halaman %{page_input} dari %{pages}"
+    combo_nav_js: "<label>Halaman %{page_input}</label> dari %{pages}"
 
-    items_selector_js: "Tampilkan %{items_input} %{item_name} per halaman"
+    items_selector_js: "<label>Tampilkan %{items_input} %{item_name} per halaman</label>"

data/lib/locales/it.yml

@@ -17,6 +17,6 @@ it:
       single_page: "Visualizzazione di <b>%{count}</b> %{item_name}"
       multiple_pages: "Visualizzazione %{item_name} <b>%{from}-%{to}</b> di <b>%{count}</b> in totale"
 
-    combo_nav_js: "Pagina %{page_input} di %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input}</label> di %{pages}"
 
-    items_selector_js: "Mostra %{items_input} %{item_name} per pagina"
+    items_selector_js: "<label>Mostra %{items_input} %{item_name} per pagina</label>"

data/lib/locales/ja.yml

@@ -15,6 +15,6 @@ ja:
       single_page: "<b>%{count}</b> 件の%{item_name}"
       multiple_pages: "<b>%{count}</b> 件中 <b>%{from}-%{to}</b> 件目の%{item_name}を表示中"
 
-    combo_nav_js: "%{page_input} / %{pages} ページ"
+    combo_nav_js: "<label>%{page_input}</label> / %{pages} ページ"
 
-    items_selector_js: "%{items_input} 件ずつ表示"
+    items_selector_js: "<label>%{items_input} 件ずつ表示</label>"

data/lib/locales/km.yml

@@ -14,6 +14,6 @@ km:
       single_page: "បង្ហាញ <b>%{count}</b> %{item_name}"
       multiple_pages: "បង្ហាញ %{item_name} <b>%{from}-%{to}</b> នៃ <b>%{count}</b> ជាចំនួនសរុប"
 
-    combo_nav_js: "ទំព័រ %{page_input} នៃ %{pages}"
+    combo_nav_js: "<label>ទំព័រ %{page_input}</label> នៃ %{pages}"
 
-    items_selector_js: "បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ"
+    items_selector_js: "<label>បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ</label>"