Trevor Buckner
a5f12ca0b4
Merge branch 'master' into dependabot/npm_and_yarn/dompurify-3.2.0
2024-11-12 00:27:07 -05:00
Trevor Buckner
07e0a7c1b5
Merge pull request #3820 from G-Ambatte/addAdminFixScriptTool-#3801
...
Add script fix tool to Admin page #3801
2024-11-12 00:21:05 -05:00
Trevor Buckner
2e9c7b1d9b
Shorten label
2024-11-12 00:20:37 -05:00
Trevor Buckner
0ddc3ae5b9
Merge branch 'master' into addAdminFixScriptTool-#3801
2024-11-12 00:16:07 -05:00
Trevor Buckner
8c6c8f861d
Automatically re-check for scripts
...
Adding a separate `keepText` field for the `updateBrew()` API might be a bandaid for something that should be looked at more deeply as a separate refactor, considering `updateBrew()` is configured to just return the stub and not the whole document.
For now, re-scanning for script tags after updating can be as simple as just re-looking up the brew.
2024-11-12 00:08:56 -05:00
dependabot[bot]
107aa34ee4
Bump dompurify from 3.1.7 to 3.2.0
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 3.1.7 to 3.2.0.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/3.1.7...3.2.0 )
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-11-12 03:12:02 +00:00
Trevor Buckner
e006826e3e
Merge pull request #3891 from dbolack-ab/Issue_3718
...
Fix Issue 3718 by bounds checking prerender.
2024-11-11 22:04:36 -05:00
David Bolack
4e4463fe4d
Fix Issue 3718 by bounds checking prerender.
2024-11-11 11:17:00 -06:00
Gazook89
1a56c393ab
Merge branch 'master' into Update-core-and-reset
2024-11-10 21:50:03 -06:00
Gazook89
9bc4b1fb56
Changes to core.less, reset.less, and toolbar
...
Making some changes to the reset.less so that some default UA button styling is removed.
Then, changing core.less so that the classic "HB" button styling is scoped to a certain class `.colorButton`. This will make it easier to use the button element in other places.
2024-11-10 21:48:01 -06:00
Gazook89
4bad047f93
Merge branch 'master' into Intersection-Observer
2024-11-10 15:56:03 -06:00
Gazook89
234d484a74
Merge remote-tracking branch 'upstream/master'
2024-11-10 15:55:54 -06:00
G.Ambatte
dc1d40512b
Reinstate length check
2024-11-10 21:45:17 +13:00
G.Ambatte
2dafbf2080
Simplify Admin brew lookup function
2024-11-10 20:19:30 +13:00
G.Ambatte
033b7fa44f
Lint fix
2024-11-10 19:35:57 +13:00
G.Ambatte
2c4f705072
Merge branch 'addAdminFixScriptTool-#3801' of https://github.com/G-Ambatte/homebrewery into addAdminFixScriptTool-#3801
2024-11-10 19:34:25 +13:00
G.Ambatte
ee811e94e1
Remove error handling that can never trigger
2024-11-10 19:34:19 +13:00
G.Ambatte
fcae147723
Merge branch 'master' into addAdminFixScriptTool-#3801
2024-11-10 19:34:17 +13:00
G.Ambatte
b3793a3330
Simplify scriptCount logic
2024-11-10 19:30:57 +13:00
G.Ambatte
952b67aed3
Remove checkForScript state
2024-11-10 19:29:28 +13:00
G.Ambatte
27f14b042b
Remove comment about irrelevant tag cleaning
2024-11-10 19:24:54 +13:00
G.Ambatte
49d30007d3
Merge branch 'addAdminFixScriptTool-#3801' of https://github.com/G-Ambatte/homebrewery into addAdminFixScriptTool-#3801
2024-11-10 19:23:47 +13:00
G.Ambatte
bd26f02ddb
Remove getBrew admin regex search
2024-11-10 19:23:42 +13:00
Trevor Buckner
ccc37fc0d5
Merge pull request #3873 from naturalcrit/dependabot/npm_and_yarn/globals-15.12.0
...
Bump globals from 15.11.0 to 15.12.0
2024-11-10 01:15:53 -05:00
dependabot[bot]
9973999e86
Bump globals from 15.11.0 to 15.12.0
...
Bumps [globals](https://github.com/sindresorhus/globals ) from 15.11.0 to 15.12.0.
- [Release notes](https://github.com/sindresorhus/globals/releases )
- [Commits](https://github.com/sindresorhus/globals/compare/v15.11.0...v15.12.0 )
---
updated-dependencies:
- dependency-name: globals
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-11-10 06:14:56 +00:00
Trevor Buckner
2aec54748a
Merge pull request #3871 from naturalcrit/dependabot/npm_and_yarn/eslint-9.14.0
...
Bump eslint from 9.13.0 to 9.14.0
2024-11-10 01:13:42 -05:00
dependabot[bot]
5585c27cb8
Bump eslint from 9.13.0 to 9.14.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 9.13.0 to 9.14.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v9.13.0...v9.14.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-11-10 06:11:39 +00:00
Trevor Buckner
52ae343309
Merge pull request #3881 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.9.0
...
Bump eslint-plugin-jest from 28.8.3 to 28.9.0
2024-11-10 01:10:26 -05:00
dependabot[bot]
f8d60fc4da
Bump eslint-plugin-jest from 28.8.3 to 28.9.0
...
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest ) from 28.8.3 to 28.9.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases )
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v28.8.3...v28.9.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-11-10 06:08:20 +00:00
Trevor Buckner
69e827a663
Merge pull request #3882 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.28.0
...
Bump react-router-dom from 6.27.0 to 6.28.0
2024-11-10 01:06:58 -05:00
Trevor Buckner
d1d73023a2
Merge branch 'master' into dependabot/npm_and_yarn/react-router-dom-6.28.0
2024-11-10 00:55:34 -05:00
Trevor Buckner
f4af19ed81
Merge pull request #3885 from Gazook89/Fix-dialog.jsx
...
Fix Dialog.jsx to prevent crashes
2024-11-10 00:06:39 -05:00
Gazook89
bc5a9c9039
lint
2024-11-08 21:57:13 -06:00
Gazook89
f7dfedcd44
give dismisskeys a default
2024-11-08 21:57:13 -06:00
Gazook89
b7b1981bde
lint
2024-11-08 21:56:45 -06:00
Gazook89
2e8368d08c
give dismisskeys a default
2024-11-08 21:56:35 -06:00
Gazook89
28a7f24989
add scrollToHash method back in
...
pretty much completely unchanged, was originally moved just to help with merging master in (ie it was erroneously removed)
2024-11-07 20:32:30 -06:00
Gazook89
28855d02a6
dynamic text input width to match characters
2024-11-07 19:46:07 -06:00
Gazook89
650ec04417
fix 'disabled' attribute on min/max of page range
2024-11-07 18:56:19 -06:00
Gazook89
9ef11bca99
lint and refactor
2024-11-07 10:40:44 -06:00
Gazook89
88b34a7ba3
Fix 'current page' input when zoomed in close
...
When the page is zoomed in very close, such that <30% of the page is in view, it doesn't register changes to the 'current page'. This fixes that, passing in the 'centerPage' if 'visiblePages' is empty.
I don't love this fix, i think the visiblePages should always have *something* in it, but I can't quite figure out how to set that (since the normal update to visiblePages is happening in an observer that doesn't fire if nothing is in view).
2024-11-07 10:17:43 -06:00
G.Ambatte
c6b0b6a0ea
Merge branch 'master' into addAdminFixScriptTool-#3801
2024-11-07 23:31:04 +13:00
Gazook89
9d86384032
refactor styles
2024-11-06 23:07:46 -06:00
Gazook89
a6bc87bcea
apply displayOptions to legacy brews as well.
2024-11-06 23:07:03 -06:00
Gazook89
63add047b6
'fit page' zoom button fits two pages in "facing" spread
...
If the 'facing' spread is active, the 'fit to view' zoom button fits two pages side by side in the view, rather than setting only one page in view.
2024-11-06 23:03:24 -06:00
Gazook89
a0e88bb24f
Add comment about future Popover API use
2024-11-06 21:55:30 -06:00
Gazook89
5b14e0e9b5
tweak alignment of spreads
...
the `safe` keyword for `justify-content`, in combo with `center`, means that the content will be centered in the viewport unless there is not enough space for it. If there is not enough space, it aligns it to the *start*/left edge, rather than keeping it centered and clipping the left edge of the page.
2024-11-06 21:55:16 -06:00
Gazook89
274e734135
add displayOptions to dependency array for memo
...
The memoization of the renderPages() method prevents a re-render when something like pageShadows is updated, so displayOptions are added to the dependency array in the memo method.
2024-11-06 21:53:14 -06:00
dependabot[bot]
7c7326b42a
Bump react-router-dom from 6.27.0 to 6.28.0
...
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom ) from 6.27.0 to 6.28.0.
- [Release notes](https://github.com/remix-run/react-router/releases )
- [Changelog](https://github.com/remix-run/react-router/blob/react-router-dom@6.28.0/packages/react-router-dom/CHANGELOG.md )
- [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.28.0/packages/react-router-dom )
---
updated-dependencies:
- dependency-name: react-router-dom
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-11-07 03:42:03 +00:00
Gazook89
3818424251
Adjust "next page" button
...
Prior to fix, the "next page" button in the toolbar wouldn't work well if there were multiple pages in view that were in a single 'row'. This is because the logic is to take the pages that are "visible", take the max of those pages, and then scroll to that page. But the issue is that if the 'max' page is in the same row as other pages, the range of visible pages doesn't change....the max will always be the same.
So the change here basically runs the scroll function twice-- if the first run results in the same 'max' page as before the scroll, it runs it again but with the target page being "max + 1", which will bump the target to the next row.
2024-11-06 21:24:18 -06:00