Commit 0c79f86
committed
Merge branch 'develop' into fix/bot-2716-paginationnav-default-anchor-display-ux-differs-fr
Resolves conflicts with #2730 (Bootstrap-style wrappers), #2731
(viewStyle preset), and #2736 (whereIn empty-array fix) — all of which
landed on develop while this PR was in review.
Conflict resolutions:
- CHANGELOG.md: kept both this PR's `Fixed` entry and #2736's QueryBuilder
empty-IN fix; they are independent.
- CLAUDE.md: composed all three feature sections (auto-mode tri-state,
viewStyle presets, manual Bootstrap composition) into one pagination
reference block; the `Bootstrap 5 — manual composition` comment now also
notes `showFirst="always"` to restore 3.x always-show behaviour.
- vendor/wheels/events/init/functions.cfm: added both `windowSize = 2`
and `viewStyle = "plain"` defaults to the `paginationNav` function
argument map.
- vendor/wheels/view/pagination.cfc: added both `windowSize` and
`viewStyle` to the docblock, signature, and `skipArgs` list. In the
`$renderPaginationNav` early-return path, anchor display flags are now
resolved through `$paginationShouldShowAnchor()` so viewStyle presets
honour the new tri-state `"auto"` / `"always"` / `"never"` modes
consistently with the plain path.
- vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc: two viewStyle
preset tests that asserted First/Last anchor presence at page=2 (BS5
per-item wrapping) and page=1 (Tailwind disabled-span) now explicitly
pass `showFirst="always"` / `showLast="always"` — the new default
`"auto"` mode auto-suppresses these when the rendered page-number
window already reaches the boundary, which is the intended behaviour
of this PR.
Verified locally on Lucee 7 + SQLite: view (555/0/0) and model (830/0/0)
spec bundles green.
Signed-off-by: Peter Amiri <peter@alurium.com>16 files changed
Lines changed: 1005 additions & 17 deletions
File tree
- docs/releases
- blog-drafts
- blog-skeletons
- vendor/wheels
- events/init
- model/query
- tests/specs
- model
- view
- view
- web/sites/guides/src/content/docs
- v4-0-0/basics
- v4-0-1-snapshot/basics
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
| 40 | + | |
39 | 41 | | |
40 | 42 | | |
41 | 43 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
471 | 471 | | |
472 | 472 | | |
473 | 473 | | |
474 | | - | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
475 | 487 | | |
476 | 488 | | |
477 | 489 | | |
| |||
495 | 507 | | |
496 | 508 | | |
497 | 509 | | |
498 | | - | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
499 | 515 | | |
500 | 516 | | |
501 | 517 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
293 | 293 | | |
294 | 294 | | |
295 | 295 | | |
296 | | - | |
| 296 | + | |
0 commit comments