pagy 4.4.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e9fa30f5123b3b985a58c0f20e00803b8708662d25e4b8116f786264adf382
-  data.tar.gz: fd51c8bf8bb897c01382459c4ab1a6baf3e28c7c9437213652382cbf5d01b8f8
+  metadata.gz: 67bf0b9d4c13c5ca1e0698f6e4fd928e07eaad4fd3e8dfe2ef8d95612e5eb8d9
+  data.tar.gz: 40fae4aadf56256885e813847a0df296bb857ea48ed629a49d6fd20092fe4dbf
 SHA512:
-  metadata.gz: 073dd75676b37ba14baaccd30a58ce008e8d32dd8e1dfd8508bc02abf0f1d85bfe8a503a4790b4157cd8a36f3e8b1c89284ae3d83c0ea8cb6565e5e32a74985d
-  data.tar.gz: 449da76a99d14327a89fcc30fad843dc5581c8225fab8c5678aa72f9888b160ebbd09d6c1b6946d8bcd1002267803a72b97a28de7797ac1a0be28ece704475f6
+  metadata.gz: c2408b52d3e5cf97ea5d32cc2da809f2e9e38802767555b3ecd94a7947d9e52adf45e623c992acf2c1a12dcacf081f01823bc0e59fd97a6c980d68d08af1b8ea
+  data.tar.gz: d0ffa69cc1cff5e0d5eb767e77d8abe63fe1df47f19c6535677c481c87ea3bd0fdc81042571fb02b3015b72377d9a7b9aa738bce0353d8e8ec62120608927ffe

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.4.0)
+# Pagy initializer file (4.7.1)
 # 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
 

data/lib/javascripts/pagy.js

@@ -2,109 +2,116 @@
 
 function Pagy(){}
 
-Pagy.version = '4.4.0';
+Pagy.version = '4.7.1'
 
-Pagy.timeout = 100;
+Pagy.delay = 100
 
-Pagy.timeoutId = 0;
+Pagy.init =
+  function(arg) {
+    var target   = arg instanceof Event || arg === undefined ? document : arg,
+        elements = target.querySelectorAll('[data-pagy-json]')
+    for (var i = 0, len = elements.length; i < len; i++) {
+      var args  = JSON.parse(elements[i].getAttribute('data-pagy-json')),
+          fname = args.shift()
+      args.unshift(elements[i])
+      Pagy[fname].apply(null, args)
+    }
+  }
 
-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);
-              }
-            }
-
-Pagy.nav = function(pagyEl, tags, sequels, param) {
-             var lastWidth = undefined,
-                 timeoutId = 0,
-                 pageREg   = new RegExp(/__pagy_page__/g),
-                 widths    = [],
-                 wait      = function() { clearTimeout(timeoutId); timeoutId = setTimeout(pagyEl.render, Pagy.timeout) };
+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 })
 
-             for (var width in sequels) { widths.push(parseInt(width)) } // fine with sequels structure
-             widths.sort(function(a, b) { return b - a });
+    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()
+ }
 
-             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 }
-                               }
-                               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();
-           }
-
-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.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.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();
-                              }
-                            };
-                        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.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.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.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.renderNjs = function() {
-                   var navs = document.getElementsByClassName('pagy-njs');
-                   for (var i = 0, len = navs.length; i < len; i++) { navs[i].render() }
-                 }
+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.wait = function() {
-              clearTimeout(Pagy.timeoutId);
-              Pagy.timeoutId = setTimeout(Pagy.renderNjs, Pagy.timeout);
-            }
+Pagy.waitForMe =
+  function() {
+    if (typeof(Pagy.tid) === 'number') { clearTimeout(Pagy.tid) }
+    Pagy.tid = setTimeout(Pagy.renderNavs, Pagy.delay)
+  }
 
-window.addEventListener('resize', Pagy.wait, true);
+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} от %{pages}</label>"
 
-    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} od %{pages}</label>"
 
-    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} de %{pages}</label>"
 
-    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} z %{pages}</label>"
 
-    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} of %{pages}</label>"
 
-    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} von %{pages}</label>"
 
-    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} of %{pages}</label>"
 
-    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} de %{pages}</label>"
 
-    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} sur %{pages}</label>"
 
-    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} od %{pages}</label>"
 
-    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} dari %{pages}</label>"
 
-    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} di %{pages}</label>"
 
-    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} / %{pages} ページ</label>"
 
-    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} នៃ %{pages}</label>"
 
-    items_selector_js: "បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ"
+    items_selector_js: "<label>បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ</label>"

data/lib/locales/ko.yml

@@ -15,6 +15,6 @@ ko:
       single_page: "<b>%{count}</b>개의 %{item_name} 표시됨"
       multiple_pages: "총 <b>%{count}</b>개의 %{item_name} 중 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "총 %{pages} 중 %{page_input} 페이지"
+    combo_nav_js: "<label>총 %{pages} 중 %{page_input} 페이지</label>"
 
-    items_selector_js: "페이지 당 %{items_input}개 표시%"
+    items_selector_js: "<label>페이지 당 %{items_input}개 표시%</label>"

data/lib/locales/nb.yml

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

data/lib/locales/nl.yml

@@ -17,6 +17,6 @@ nl:
       single_page: "Toont <b>%{count}</b> %{item_name}"
       multiple_pages: "Toont <b>%{from}-%{to}</b> %{item_name} van <b>%{count}</b> in totaal"
 
-    combo_nav_js: "Pagina %{page_input} van %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input} van %{pages}</label>"
 
-    items_selector_js: "Toont %{items_input} %{item_name} per pagina"
+    items_selector_js: "<label>Toont %{items_input} %{item_name} per pagina</label>"

data/lib/locales/pl.yml

@@ -19,6 +19,6 @@ pl:
       single_page: "Wyświetlono <b>%{count}</b> %{item_name}"
       multiple_pages: "Wyświetlono %{item_name} <b>%{from}-%{to}</b> z wszystkich <b>%{count}</b>"
 
-    combo_nav_js: "Strona %{page_input} z %{pages}"
+    combo_nav_js: "<label>Strona %{page_input} z %{pages}</label>"
 
-    items_selector_js: "Pokaż %{items_input} %{item_name} na stronie"
+    items_selector_js: "<label>Pokaż %{items_input} %{item_name} na stronie</label>"

data/lib/locales/pt-BR.yml

@@ -17,6 +17,6 @@ pt-BR:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
 
-    combo_nav_js: "Página %{page_input} de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
-    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/pt.yml

@@ -17,6 +17,6 @@ pt:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
 
-    combo_nav_js: "Página %{page_input} de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
-    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/ru.yml

@@ -19,6 +19,6 @@ ru:
       single_page: "<b>%{count}</b> %{item_name}"
       multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
 
-    combo_nav_js: "Страница %{page_input} из %{pages}"
+    combo_nav_js: "<label>Страница %{page_input} из %{pages}</label>"
 
-    items_selector_js: "Показать %{items_input} %{item_name} на странице"
+    items_selector_js: "<label>Показать %{items_input} %{item_name} на странице</label>"

data/lib/locales/sr.yml

@@ -18,6 +18,6 @@ sr:
       single_page: "Приказује се <b>%{count}</b> %{item_name}"
       multiple_pages: "Приказ %{item_name} <b>%{from}-%{to}</b> од <b>%{count}</b> укупно"
 
-    combo_nav_js: "Страниca %{page_input} од %{pages}"
+    combo_nav_js: "<label>Страниca %{page_input} од %{pages}</label>"
 
-    items_selector_js: "Прикажи %{items_input} %{item_name} по страниcи"
+    items_selector_js: "<label>Прикажи %{items_input} %{item_name} по страниcи</label>"

data/lib/locales/sv-SE.yml

@@ -18,6 +18,6 @@ sv-SE:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "Sida %{page_input} av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sv.yml

@@ -18,6 +18,6 @@ sv:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "Sida %{page_input} av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sw.yml

@@ -17,6 +17,6 @@ sw:
       single_page: "Inaonyesha %{item_name} <b>%{count}</b>"
       multiple_pages: "Inaonyesha %{item_name} <b>%{from}-%{to}</b> ya <b>%{count}</b> kwa jumla"
 
-    combo_nav_js: "Kurasa %{page_input} ya %{pages}"
+    combo_nav_js: "<label>Kurasa %{page_input} ya %{pages}</label>"
 
-    items_selector_js: "Onyesha %{items_input} %{item_name} kwa kila ukurasa"
+    items_selector_js: "<label>Onyesha %{items_input} %{item_name} kwa kila ukurasa</label>"

data/lib/locales/tr.yml

@@ -15,6 +15,6 @@ tr:
       single_page: "Toplam <b>%{count}</b> %{item_name} gösteriliyor"
       multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor"
 
-    combo_nav_js: "Sayfa %{page_input} / %{pages}"
+    combo_nav_js: "<label>Sayfa %{page_input} / %{pages}</label>"
 
-    items_selector_js: "Sayfada %{items_input} %{item_name} göster"
+    items_selector_js: "<label>Sayfada %{items_input} %{item_name} göster</label>"

data/lib/locales/uk.yml

@@ -0,0 +1,24 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+uk:
+  pagy:
+
+    item_name:
+      one: "запис"
+      few: "записів"
+      many: "записів"
+      other: "записів"
+
+    nav:
+      prev: "‹ Назад"
+      next: "Далі ›"
+      gap: "…"
+
+    info:
+      no_items: "Більше %{item_name} немає"
+      single_page: "<b>%{count}</b> %{item_name}"
+      multiple_pages: "Загалом <b>%{count}</b> %{item_name}, показані з <b>%{from}</b> по <b>%{to}</b>"
+
+    combo_nav_js: "<label>Сторінка %{page_input} з %{pages}</label>"
+
+    items_selector_js: "<label>Показати %{items_input} %{item_name} на сторінці</label>"

data/lib/locales/utils/p11n.rb

@@ -85,6 +85,7 @@ plurals = Hash.new(p11n[:one_other]).tap do |hash|
   hash['sv']    = p11n[:one_two_other]
   hash['sv-SE'] = p11n[:one_two_other]
   hash['tr']    = p11n[:other]
+  hash['uk']    = p11n[:east_slavic]
   hash['zh-CN'] = p11n[:other]
   hash['zh-HK'] = p11n[:other]
   hash['zh-TW'] = p11n[:other]

data/lib/locales/zh-CN.yml

@@ -15,6 +15,6 @@ zh-CN:
       single_page: "显示<b>%{count}</b> 项%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 项%{item_name}，显示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "第 %{page_input} / %{pages} 页"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 页</label>"
 
-    items_selector_js: "每页显示 %{items_input} 条%"
+    items_selector_js: "<label>每页显示 %{items_input} 条%</label>"

data/lib/locales/zh-HK.yml

@@ -15,6 +15,6 @@ zh-HK:
       single_page: "顯示 <b>%{count}</b> %{item_name}"
       multiple_pages: "共 <b>%{count}</b>  %{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "第 %{page_input} / %{pages} 頁"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
 
-    items_selector_js: "每頁顯示 %{items_input} 記錄"
+    items_selector_js: "<label>每頁顯示 %{items_input} 記錄</label>"

data/lib/locales/zh-TW.yml

@@ -10,11 +10,11 @@ zh-TW:
       next: "下一頁 ›"
       gap: "…"
 
-    combo_nav_js: "第 %{page_input} / %{pages} 頁"
-
     info:
       no_items: "沒找到項"
       single_page: "顯示 <b>%{count}</b> 項%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 項%{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    items_selector_js: "每頁顯示 %{items_input} 項%{item_name}"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
+
+    items_selector_js: "<label>每頁顯示 %{items_input} 項%{item_name}</label>"

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # main class
 class Pagy
-  VERSION = '4.4.0'
+  VERSION = '4.7.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

data/lib/pagy/console.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'pagy'  # so you can require just the extra in the console
+require 'pagy/extras/standalone'
+
+class Pagy
+  # include Pagy::Console in irb/rails console for a ready to use pagy environment
+  module Console
+    def self.included(main)
+      main.include(Backend)
+      main.include(Frontend)
+      VARS[:url] = 'http://www.example.com/subdir'
+    end
+
+    def pagy_extras(*extras)
+      extras.each {|extra| require "pagy/extras/#{extra}"}
+      puts "Required extras: #{extras.map(&:inspect).join(', ')}"
+    end
+  end
+
+end

data/lib/pagy/extras/bootstrap.rb

@@ -11,7 +11,7 @@ class Pagy
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
 
-      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" 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
@@ -35,8 +35,7 @@ class Pagy
                '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#{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))
+      %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -48,7 +47,9 @@ class Pagy
       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#{p_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" aria-label="pager"><div class="btn-group" role="group" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           if (p_prev = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
           else
@@ -60,9 +61,7 @@ class Pagy
           else
             %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next' }</a>)
           end
-      }</div></nav>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div></nav>)
     end
 
     private

data/lib/pagy/extras/bulma.rb

@@ -11,7 +11,7 @@ class Pagy
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
 
-      html = +%(<nav#{p_id} class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bulma-nav pagination is-centered" 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]
@@ -34,8 +34,7 @@ class Pagy
                'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap' }</span></li>),
                'after'  => '</ul>' }
 
-      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))
+      %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for Bulma: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -47,7 +46,9 @@ class Pagy
       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#{p_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" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group" #{
+         pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           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
@@ -59,9 +60,7 @@ class Pagy
           else
             %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
           end
-      }</div></nav>#{
-         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div></nav>)
     end
 
     private

data/lib/pagy/extras/foundation.rb

@@ -11,7 +11,7 @@ class Pagy
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
 
-      html = +%(<nav#{p_id} class="pagy-foundation-nav" role="navigation" aria-label="Pagination"><ul class="pagination">)
+      html = +%(<nav#{p_id} class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination">)
       html << pagy_foundation_prev_html(pagy, link)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
@@ -35,8 +35,7 @@ class Pagy
                'gap'    => %(<li class="ellipsis gap" aria-hidden="true"></li>),
                'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 
-      html = %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" role="navigation" aria-label="Pagination"></nav>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for Foundation: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -48,21 +47,21 @@ class Pagy
       p_pages = pagy.pages
       input   = %(<input class="input-group-field cell shrink" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="width: #{p_pages.to_s.length+1}rem; padding: 0 0.3rem; margin: 0 0.3rem;">)
 
-      %(<nav#{p_id} class="pagy-foundation-combo-nav-js" role="navigation" aria-label="Pagination"><div class="input-group">#{
+      %(<nav#{p_id} class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           if (p_prev  = pagy.prev)
-            link.call p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0px;" aria-label="previous" class="prev button primary"'
+            link.call p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0" aria-label="previous" class="prev button primary"'
           else
-            %(<a style="margin-bottom: 0px;" class="prev button primary disabled" href="#">#{pagy_t 'pagy.nav.prev'}</a>)
+            %(<a style="margin-bottom: 0" class="prev button primary disabled" href="#">#{pagy_t 'pagy.nav.prev'}</a>)
           end
       }<span class="input-group-label">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</span>#{
           if (p_next  = pagy.next)
-            link.call p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0px;" aria-label="next" class="next button primary"'
+            link.call p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0" aria-label="next" class="next button primary"'
           else
-            %(<a style="margin-bottom: 0px;" class="next button primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
+            %(<a style="margin-bottom: 0" class="next button primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
           end
-      }</div></nav>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div></nav>)
     end
 
     private

data/lib/pagy/extras/items.rb

@@ -40,12 +40,12 @@ class Pagy
       link           = pagy_marked_link(pagy_link_proc(pagy, link_extra: link_extra))
       p_vars[:items] = p_items # restore the items
 
-      html  = %(<span#{p_id} class="pagy-items-selector-js">)
+      html  = %(<span#{p_id} class="pagy-items-selector-js" #{pagy_json_attr pagy, :items_selector, pagy.from, link}>)
       input = %(<input type="number" min="1" max="#{p_vars[:max_items]}" value="#{p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length+1}rem;">)
       html << pagy_t('pagy.items_selector_js', item_name:   item_name || pagy_t(i18n_key || p_vars[:i18n_key], count: p_items),
                                                items_input: input,
                                                count:       p_items)
-      html << %(</span>#{pagy_json_tag pagy, :items_selector, pagy.from, link})
+      html << %(</span>)
     end
 
   end

data/lib/pagy/extras/materialize.rb

@@ -36,8 +36,7 @@ class Pagy
                'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
 
-      html = %(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></div>)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -47,18 +46,18 @@ class Pagy
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      style   = ' style="vertical-align: middle;"'
-      input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 2px; border: none; border-radius: 2px; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      style   = ' style="vertical-align: middle"'
+      input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<div#{p_id} class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="pagy-compact-chip role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin: 0px;">#{
+      %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation" aria-label="pager" style="padding-right: 0" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           pagy_materialize_prev_html pagy, link, style
-      }<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{
+      }<li class="pagy-combo-input">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</div>#{
+      }</li>#{
           pagy_materialize_next_html pagy, link, style
-      }</ul></div>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</ul>)
     end
 
     private

data/lib/pagy/extras/navs.rb

@@ -17,8 +17,7 @@ class Pagy
                'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
                'after'  => pagy_nav_next_html(pagy, link) }
 
-      html = %(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -30,15 +29,15 @@ class Pagy
       p_pages = pagy.pages
       input   = %(<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;">)
 
-      %(<nav#{p_id} class="pagy-combo-nav-js pagination" role="navigation" aria-label="pager">#{
+      %(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           pagy_nav_prev_html pagy, link
       }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</span> #{
           pagy_nav_next_html pagy, link
-      }</nav>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</nav>)
     end
 
     private

data/lib/pagy/extras/semantic.rb

@@ -9,14 +9,14 @@ class Pagy
     # Pagination for semantic: it returns the html with the series of links to the pages
     def pagy_semantic_nav(pagy, pagy_id: nil, link_extra: '')
       p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: %(class="item" #{link_extra}"))
+      link = pagy_link_proc(pagy, link_extra: %(class="item" #{link_extra}))
 
-      html = +%(<div#{p_id} class="pagy-semantic-nav ui pagination menu" aria-label="pager">)
+      html = +%(<div#{p_id} class="pagy-semantic-nav ui pagination menu">)
       html << pagy_semantic_prev_html(pagy, link)
       pagy.series.each do |item|  # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
-                when Integer then link.call item                            # page link
-                when String  then %(<a class="item active">#{item}</a>)     # current page
+                when Integer then link.call item                                                 # page link
+                when String  then %(<a class="item active">#{item}</a>)                          # current page
                 when :gap    then %(<div class="disabled item">#{pagy_t 'pagy.nav.gap'}</div>)   # page gap
                 end
       end
@@ -35,8 +35,7 @@ class Pagy
                'gap'    => %(<div class="disabled item">#{pagy_t('pagy.nav.gap')}</div>),
                'after'  => pagy_semantic_next_html(pagy, link) }
 
-      html = %(<div#{p_id} class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" aria-label="pager"></div>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<div#{p_id} class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></div>)
     end
 
     # Combo pagination for semantic: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -48,15 +47,15 @@ class Pagy
       p_pages = pagy.pages
       input   = %(<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">)
 
-      %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" aria-label="pager">#{
+      %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
          pagy_semantic_prev_html pagy, link
       }<div class="pagy-combo-input item">#{
          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</div> #{
          pagy_semantic_next_html pagy, link
-      }</div>#{
-         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div>)
     end
 
     private

data/lib/pagy/extras/shared.rb

@@ -29,16 +29,16 @@ class Pagy
 
     if defined?(Oj)
       # it returns a script tag with the JSON-serialized args generated with the faster oj gem
-      def pagy_json_tag(pagy, *args)
+      def pagy_json_attr(pagy, *args)
         args << pagy.vars[:page_param] if pagy.vars[:enable_trim_extra]
-        %(<script type="application/json" class="pagy-json">#{Oj.dump(args, mode: :strict)}</script>)
+        %(data-pagy-json="#{Oj.dump(args, mode: :strict).gsub('"', '&quot;')}")
       end
     else
       require 'json'
       # it returns a script tag with the JSON-serialized args generated with the slower to_json
-      def pagy_json_tag(pagy, *args)
+      def pagy_json_attr(pagy, *args)
         args << pagy.vars[:page_param] if pagy.vars[:enable_trim_extra]
-        %(<script type="application/json" class="pagy-json">#{args.to_json}</script>)
+        %(data-pagy-json="#{args.to_json.gsub('"', '&quot;')}")
       end
     end
 

data/lib/pagy/extras/standalone.rb

@@ -55,17 +55,4 @@ class Pagy
     end
   end
 
-  # include Pagy::Console in irb/rails console for a ready to use pagy environment
-  module Console
-    def self.included(main)
-      main.include(Backend)
-      main.include(Frontend)
-      VARS[:url] = 'http://www.example.com/subdir'
-    end
-
-    def pagy_extras(*extras)
-      extras.each {|extra| require "pagy/extras/#{extra}"}
-    end
-  end
-
 end

data/lib/pagy/extras/uikit.rb

@@ -31,11 +31,10 @@ class Pagy
       tags = { 'before' => pagy_uikit_prev_html(pagy, link),
                'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="uk-active"><span>#{PAGE_PLACEHOLDER}</span></li>),
-               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t('pagy.nav.gap')}</span></li>),
+               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>),
                'after'  => pagy_uikit_next_html(pagy, link) }
 
-      html = %(<ul#{p_id} class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center"></ul>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<ul#{p_id} class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></ul>)
     end
 
     # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -45,29 +44,19 @@ class Pagy
       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="uk-input" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<div#{p_id} class="pagy-uikit-combo-nav-js uk-button-group">#{
-          if (p_prev = pagy.prev)
-            link.call p_prev, pagy_t('pagy.nav.prev'), 'class="uk-button uk-button-default"'
-          else
-            %(<button class="uk-button uk-button-default" disabled>#{pagy_t 'pagy.nav.prev'}</button>)
-          end
-      }<div class="uk-text-middle uk-margin-left uk-margin-right">#{
+      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
+          pagy_uikit_prev_html pagy, link
+      }<li>#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</div>#{
-          if (p_next = pagy.next)
-            link.call p_next, pagy_t('pagy.nav.next'), 'class="uk-button uk-button-default"'
-          else
-            %(<button class="uk-button uk-button-default" disabled>#{pagy_t 'pagy.nav.next'}</button>)
-          end
-      }</div>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</li>#{
+          pagy_uikit_next_html pagy, link
+      }</ul>)
     end
 
-
-
     private
 
       def pagy_uikit_prev_html(pagy, link)

data/lib/pagy/frontend.rb

@@ -41,7 +41,7 @@ class Pagy
       p_prev = pagy.prev
       p_next = pagy.next
 
-      html  = +%(<nav#{p_id} class="pagy-nav pagination" role="navigation" aria-label="pager">)
+      html  = +%(<nav#{p_id} class="pagy-nav pagination" aria-label="pager">)
       html << if p_prev
                 %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
               else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,
@@ -48,6 +48,7 @@ files:
 - lib/locales/sv.yml
 - lib/locales/sw.yml
 - lib/locales/tr.yml
+- lib/locales/uk.yml
 - lib/locales/utils/i18n.rb
 - lib/locales/utils/loader.rb
 - lib/locales/utils/p11n.rb
@@ -56,6 +57,7 @@ files:
 - lib/locales/zh-TW.yml
 - lib/pagy.rb
 - lib/pagy/backend.rb
+- lib/pagy/console.rb
 - lib/pagy/countless.rb
 - lib/pagy/deprecation.rb
 - lib/pagy/exceptions.rb