From 421753ad0fac2282d999dbf2e59b91fbaa521a64 Mon Sep 17 00:00:00 2001 From: Domizio Demichelis Date: Tue, 4 Jun 2024 15:38:20 +0700 Subject: [PATCH] Version 8.4.2 --- .github/ISSUE_TEMPLATE/Code.yml | 2 +- .github/latest_release_body.md | 7 +++---- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- gem/apps/calendar.ru | 2 +- gem/apps/demo.ru | 2 +- gem/apps/rails.ru | 2 +- gem/apps/repro.ru | 2 +- gem/bin/pagy | 2 +- gem/config/pagy.rb | 2 +- gem/javascripts/pagy-dev.js | 6 +++--- gem/javascripts/pagy-module.js | 2 +- gem/javascripts/pagy.js | 2 +- gem/lib/pagy.rb | 2 +- gem/pagy.gemspec | 2 +- retype.yml | 2 +- src/pagy.ts | 2 +- 17 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Code.yml b/.github/ISSUE_TEMPLATE/Code.yml index 65e767f26..50c95be33 100644 --- a/.github/ISSUE_TEMPLATE/Code.yml +++ b/.github/ISSUE_TEMPLATE/Code.yml @@ -19,7 +19,7 @@ body: attributes: label: 👀 Before submitting... options: - - label: I upgraded to pagy version 8.4.1 + - label: I upgraded to pagy version 8.4.2 required: true - label: I searched through the [Documentation](https://ddnexus.github.io/pagy/) required: true diff --git a/.github/latest_release_body.md b/.github/latest_release_body.md index df3eb2cb2..fe4c9c97b 100644 --- a/.github/latest_release_body.md +++ b/.github/latest_release_body.md @@ -8,12 +8,11 @@ the [details](https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)) - See the [CHANGELOG](https://ddnexus.github.io/pagy/changelog) for possible breaking changes -### Changes in 8.4.1 +### Changes in 8.4.2 -- Fix pagy.in in pagy_get_items method introduced in 8.4.0 (see #696) (closes #704) (closes #708) (#707) -- Fix renamed Frontend Helpers to JS Tools and typo `next_a` "aria-label" (#700) -- Fix rubocop +- Limit the playground --rerun option to linux platforms +- Simplify and improve the js environment by using bun [CHANGELOG](https://ddnexus.github.io/pagy/changelog) diff --git a/CHANGELOG.md b/CHANGELOG.md index de52ebbec..6d06448e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,11 @@ If you upgrade from version `< 8.0.0` see the following:
+## Version 8.4.2 + +- Limit the playground --rerun option to linux platforms +- Simplify and improve the js environment by using bun + ## Version 8.4.1 - Fix pagy.in in pagy_get_items method introduced in 8.4.0 (see #696) (closes #704) (closes #708) (#707) diff --git a/Gemfile.lock b/Gemfile.lock index 68650e14e..ecaf1d14a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: gem specs: - pagy (8.4.1) + pagy (8.4.2) GEM remote: https://rubygems.org/ diff --git a/gem/apps/calendar.ru b/gem/apps/calendar.ru index 25004264f..761bd7d43 100644 --- a/gem/apps/calendar.ru +++ b/gem/apps/calendar.ru @@ -18,7 +18,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#4-calendar-app -VERSION = '8.4.1' +VERSION = '8.4.2' require 'bundler/inline' require 'bundler' diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru index e19a196b5..5e7581824 100644 --- a/gem/apps/demo.ru +++ b/gem/apps/demo.ru @@ -18,7 +18,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#3-demo-app -VERSION = '8.4.1' +VERSION = '8.4.2' require 'bundler/inline' require 'bundler' diff --git a/gem/apps/rails.ru b/gem/apps/rails.ru index 379e49af7..ec28d380e 100644 --- a/gem/apps/rails.ru +++ b/gem/apps/rails.ru @@ -15,7 +15,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#2-rails-app -VERSION = '8.4.1' +VERSION = '8.4.2' # Gemfile require 'bundler/inline' diff --git a/gem/apps/repro.ru b/gem/apps/repro.ru index 51f803d38..6961c39b8 100644 --- a/gem/apps/repro.ru +++ b/gem/apps/repro.ru @@ -15,7 +15,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#1-repro-app -VERSION = '8.4.1' +VERSION = '8.4.2' require 'bundler/inline' require 'bundler' diff --git a/gem/bin/pagy b/gem/bin/pagy index 20dffaaac..4c516b4a8 100755 --- a/gem/bin/pagy +++ b/gem/bin/pagy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -VERSION = '8.4.1' +VERSION = '8.4.2' APPS = %w[repro rails demo calendar].freeze LINUX = RbConfig::CONFIG['host_os'].include?('linux') diff --git a/gem/config/pagy.rb b/gem/config/pagy.rb index 471b61b57..c4304b18b 100644 --- a/gem/config/pagy.rb +++ b/gem/config/pagy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# Pagy initializer file (8.4.1) +# Pagy initializer file (8.4.2) # Customize only what you really need and notice that the core 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 diff --git a/gem/javascripts/pagy-dev.js b/gem/javascripts/pagy-dev.js index a508ab8b9..154d388b6 100644 --- a/gem/javascripts/pagy-dev.js +++ b/gem/javascripts/pagy-dev.js @@ -75,7 +75,7 @@ window.Pagy = (() => { }; const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), ""); return { - version: "8.4.1", + version: "8.4.2", init(arg) { const target = arg instanceof Element ? arg : document; const elements = target.querySelectorAll("[data-pagy]"); @@ -100,5 +100,5 @@ window.Pagy = (() => { }; })(); -//# debugId=05192D5E2035193864756e2164756e21 -//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["pagy.ts"],
  "sourcesContent": [
    "type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n    readonly before:string\n    readonly a:string\n    readonly current:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n                                               entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(\n                                                   el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth   = -1;\n        const fillIn    = (a:string, page:string, label:string):string =>\n            a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function () {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html     = tokens.before;  // already trimmed in html\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item  = series[i];\n                const label = labels[i];\n                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tokens.a, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tokens.gap;\n                } else { // active page\n                    filled = fillIn(tokens.current, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n            }\n            html += tokens.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n    // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const url  = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, url];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n        const input   = el.querySelector(\"input\") as HTMLInputElement;\n        const link    = el.querySelector(\"a\") as HTMLAnchorElement;\n        const initial = input.value;\n        const action  = function () {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n            link.href = url;\n            link.click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (a:string, param:string) =>\n        a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"8.4.1\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element | never) {\n            const target   = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n\nexport default Pagy;\n"
  ],
  "mappings": "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",
  "debugId": "05192D5E2035193864756e2164756e21",
  "names": []
} +//# debugId=22425B3DDA38810464756e2164756e21 +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["pagy.ts"],
  "sourcesContent": [
    "type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n    readonly before:string\n    readonly a:string\n    readonly current:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n                                               entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(\n                                                   el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth   = -1;\n        const fillIn    = (a:string, page:string, label:string):string =>\n            a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function () {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html     = tokens.before;  // already trimmed in html\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item  = series[i];\n                const label = labels[i];\n                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tokens.a, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tokens.gap;\n                } else { // active page\n                    filled = fillIn(tokens.current, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n            }\n            html += tokens.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n    // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const url  = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, url];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n        const input   = el.querySelector(\"input\") as HTMLInputElement;\n        const link    = el.querySelector(\"a\") as HTMLAnchorElement;\n        const initial = input.value;\n        const action  = function () {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n            link.href = url;\n            link.click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (a:string, param:string) =>\n        a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"8.4.2\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element | never) {\n            const target   = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n\nexport default Pagy;\n"
  ],
  "mappings": "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",
  "debugId": "22425B3DDA38810464756e2164756e21",
  "names": []
} diff --git a/gem/javascripts/pagy-module.js b/gem/javascripts/pagy-module.js index 0762fcdee..7d2d8faa7 100644 --- a/gem/javascripts/pagy-module.js +++ b/gem/javascripts/pagy-module.js @@ -74,7 +74,7 @@ const Pagy = (() => { }; const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), ""); return { - version: "8.4.1", + version: "8.4.2", init(arg) { const target = arg instanceof Element ? arg : document; const elements = target.querySelectorAll("[data-pagy]"); diff --git a/gem/javascripts/pagy.js b/gem/javascripts/pagy.js index 2e9321007..d73ee9bca 100644 --- a/gem/javascripts/pagy.js +++ b/gem/javascripts/pagy.js @@ -1 +1 @@ -window.Pagy=(()=>{const x=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),A=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,Q)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,Q);if((B.pagyRender=function(){const H=K.find((R)=>RR.toString());for(let R in Q){const U=Q[R],j=Y[R];let X;if(typeof U==="number")X=T(D.a,U.toString(),j);else if(U==="gap")X=D.gap;else X=T(D.current,U,j);M+=typeof G==="string"&&U==1?$(X,G):X}M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))x.observe(F)},C=(B,[D,E])=>Z(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),J=(B,[D,E,z])=>{Z(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_items__/,G);return[F,K]},z)},Z=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((Y)=>parseInt(Y)||0);if(TH){z.value=F,z.select();return}let[M,Q]=D(z.value);if(typeof E==="string"&&M==="1")Q=$(Q,E);G.href=Q,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,z.select)),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},$=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"8.4.1",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")A(z,K);else if(F==="combo")C(z,K);else if(F==="selector")J(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})(); +window.Pagy=(()=>{const x=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),A=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,Q)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,Q);if((B.pagyRender=function(){const H=K.find((R)=>RR.toString());for(let R in Q){const U=Q[R],j=Y[R];let X;if(typeof U==="number")X=T(D.a,U.toString(),j);else if(U==="gap")X=D.gap;else X=T(D.current,U,j);M+=typeof G==="string"&&U==1?$(X,G):X}M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))x.observe(F)},C=(B,[D,E])=>Z(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),J=(B,[D,E,z])=>{Z(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_items__/,G);return[F,K]},z)},Z=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((Y)=>parseInt(Y)||0);if(TH){z.value=F,z.select();return}let[M,Q]=D(z.value);if(typeof E==="string"&&M==="1")Q=$(Q,E);G.href=Q,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,z.select)),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},$=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"8.4.2",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")A(z,K);else if(F==="combo")C(z,K);else if(F==="selector")J(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})(); diff --git a/gem/lib/pagy.rb b/gem/lib/pagy.rb index cb5a9a0e8..017caba4f 100644 --- a/gem/lib/pagy.rb +++ b/gem/lib/pagy.rb @@ -5,7 +5,7 @@ # Core class class Pagy - VERSION = '8.4.1' + VERSION = '8.4.2' # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc. def self.root diff --git a/gem/pagy.gemspec b/gem/pagy.gemspec index 779cba4f4..75dabc33b 100644 --- a/gem/pagy.gemspec +++ b/gem/pagy.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = 'pagy' - s.version = '8.4.1' + s.version = '8.4.2' s.authors = ['Domizio Demichelis'] s.email = ['dd.nexus@gmail.com'] s.summary = 'The best pagination ruby gem' diff --git a/retype.yml b/retype.yml index 1641ec4bd..396c4e2ea 100644 --- a/retype.yml +++ b/retype.yml @@ -8,7 +8,7 @@ url: https://ddnexus.github.io/pagy branding: title: Pagy - label: 8.4.1 + label: 8.4.2 colors: label: text: "#FFFFFF" diff --git a/src/pagy.ts b/src/pagy.ts index 619f43ed0..d1a2998c0 100644 --- a/src/pagy.ts +++ b/src/pagy.ts @@ -98,7 +98,7 @@ const Pagy = (() => { // Public interface return { - version: "8.4.1", + version: "8.4.2", // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args init(arg?:Element | never) {