diff --git a/e2e/cypress/support/test-helper.ts b/e2e/cypress/support/test-helper.ts index 85286fecf..c8978aa23 100644 --- a/e2e/cypress/support/test-helper.ts +++ b/e2e/cypress/support/test-helper.ts @@ -14,7 +14,7 @@ interface TestNavOpts { export function testNav(app:string, id:string, {path = "/", pages = ["3", "50"], rjs = false}:TestNavOpts) { it(`[${app}] Test ${id}`, () => { if (rjs) { - const widths = [450, 700, 950, 1050]; + const widths = [700, 950, 1050]; for (const width of widths) { cy.viewport(width, 1000); cy.visit(path); diff --git a/e2e/snapshots.js b/e2e/snapshots.js index 9a8613009..9280df5dd 100644 --- a/e2e/snapshots.js +++ b/e2e/snapshots.js @@ -4,67 +4,57 @@ module.exports = { "1": "
@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[demo] Test #nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[demo] Test #nav-js-responsive": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "12": "", + "12": "", "13": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "14": "", + "14": "", "15": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "16": "", + "16": "", "17": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "18": "", + "18": "", "19": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "20": "", + "20": "", "21": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "22": "", + "22": "", "23": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "24": "", + "24": "", "25": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "26": "", + "26": "", "27": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "28": "", + "28": "", "29": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "30": "", - "31": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "32": "", - "33": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "34": "", - "35": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "36": "", - "37": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "38": "", - "39": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "40": "" + "30": "" }, "[demo] Test #combo-nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", @@ -100,8 +90,8 @@ module.exports = { "9": "", "10": "", "11": "", - "12": "", - "13": "", + "12": "", + "13": "", "14": "", "15": "@records:\n 701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,718,719,720\n
", "16": "", @@ -114,8 +104,8 @@ module.exports = { "23": "", "24": "", "25": "", - "26": "", - "27": "", + "26": "", + "27": "", "28": "", "29": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "30": "", @@ -128,8 +118,8 @@ module.exports = { "37": "", "38": "", "39": "", - "40": "", - "41": "", + "40": "", + "41": "", "42": "" } }, @@ -138,67 +128,57 @@ module.exports = { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[demo] Test #nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[demo] Test #nav-js-responsive": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "12": "", + "12": "", "13": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "14": "", + "14": "", "15": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "16": "", + "16": "", "17": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "18": "", + "18": "", "19": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "20": "", + "20": "", "21": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "22": "", + "22": "", "23": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "24": "", + "24": "", "25": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "26": "", + "26": "", "27": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "28": "", + "28": "", "29": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "30": "", - "31": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "32": "", - "33": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "34": "", - "35": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "36": "", - "37": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "38": "", - "39": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "40": "" + "30": "" }, "[demo] Test #combo-nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", @@ -228,67 +208,57 @@ module.exports = { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[demo] Test #nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[demo] Test #nav-js-responsive": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "12": "", + "12": "", "13": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "14": "", + "14": "", "15": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "16": "", + "16": "", "17": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "18": "", + "18": "", "19": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "20": "", + "20": "", "21": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "22": "", + "22": "", "23": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "24": "", + "24": "", "25": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "26": "", + "26": "", "27": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "28": "", + "28": "", "29": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "30": "", - "31": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "32": "", - "33": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "34": "", - "35": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "36": "", - "37": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "38": "", - "39": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "40": "" + "30": "" }, "[demo] Test #combo-nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", @@ -319,67 +289,57 @@ module.exports = { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[repro] Test #nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "" + "10": "" }, "[repro] Test #nav-js-responsive": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "12": "", + "12": "", "13": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "14": "", + "14": "", "15": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "16": "", + "16": "", "17": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "18": "", + "18": "", "19": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "20": "", + "20": "", "21": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "22": "", + "22": "", "23": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "24": "", + "24": "", "25": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "26": "", + "26": "", "27": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "28": "", + "28": "", "29": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "30": "", - "31": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "32": "", - "33": "@records:\n 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "34": "", - "35": "@records:\n 41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "36": "", - "37": "@records:\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "38": "", - "39": "@records:\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "40": "" + "30": "" }, "[repro] Test #combo-nav-js": { "1": "@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru index b6f11f8e9..3f498dccb 100644 --- a/gem/apps/demo.ru +++ b/gem/apps/demo.ru @@ -44,7 +44,6 @@ end require 'pagy/extras/items' require 'pagy/extras/trim' Pagy::DEFAULT[:trim_extra] = false # opt-in trim -Pagy::DEFAULT[:size] = [1, 4, 4, 1] # old size default # sinatra setup require 'sinatra/base' @@ -381,18 +380,18 @@ for details <%= html = send(:"pagy#{prefix}_nav", @pagy, id: 'simple-nav', aria_label: 'Pages simple-nav', size: 5) %> <%= highlight(html) %> -size: [1,4,4,1]
size: 7
size: [1,4,4,1]
size: 7
steps: {...}
(Resize the window to see)