From 606af87e0ffeb20714e28ffa794755f58e44c176 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:53:15 +0000 Subject: [PATCH 1/4] Bump dompurify from 3.1.6 to 3.1.7 Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.1.6 to 3.1.7. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/3.1.6...3.1.7) --- updated-dependencies: - dependency-name: dompurify dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b041552e..d575fb9b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "cookie-parser": "^1.4.6", "create-react-class": "^15.7.0", "dedent-tabs": "^0.10.3", - "dompurify": "^3.1.6", + "dompurify": "^3.1.7", "expr-eval": "^2.0.2", "express": "^4.21.0", "express-async-handler": "^1.2.0", @@ -5525,10 +5525,9 @@ } }, "node_modules/dompurify": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz", - "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==", - "license": "(MPL-2.0 OR Apache-2.0)" + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz", + "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==" }, "node_modules/duplexer2": { "version": "0.1.4", diff --git a/package.json b/package.json index 06edb3c0d..33c004b18 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "cookie-parser": "^1.4.6", "create-react-class": "^15.7.0", "dedent-tabs": "^0.10.3", - "dompurify": "^3.1.6", + "dompurify": "^3.1.7", "expr-eval": "^2.0.2", "express": "^4.21.0", "express-async-handler": "^1.2.0", From 1f047890abd760238136dd3ae85ca4b51ffb437c Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Fri, 27 Sep 2024 23:32:19 +1200 Subject: [PATCH 2/4] Change default value of currentEditorCursorPageNum --- client/homebrew/brewRenderer/brewRenderer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 7268e4b34..087e087cd 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -55,7 +55,7 @@ const BrewRenderer = (props)=>{ theme : '5ePHB', lang : '', errors : [], - currentEditorCursorPageNum : 0, + currentEditorCursorPageNum : 1, currentEditorViewPageNum : 0, currentBrewRendererPageNum : 0, themeBundle : {}, From ae123a83105b6719e22e5436dcab3b5f76a7e029 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 27 Sep 2024 11:35:01 -0400 Subject: [PATCH 3/4] Change the other page number values as well --- client/homebrew/brewRenderer/brewRenderer.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 087e087cd..818445714 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -56,8 +56,8 @@ const BrewRenderer = (props)=>{ lang : '', errors : [], currentEditorCursorPageNum : 1, - currentEditorViewPageNum : 0, - currentBrewRendererPageNum : 0, + currentEditorViewPageNum : 1, + currentBrewRendererPageNum : 1, themeBundle : {}, onPageChange : ()=>{}, ...props From 9b58db9f1e45baabcd9d70dad9ab5c62cf5ece1c Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 27 Sep 2024 15:03:29 -0400 Subject: [PATCH 4/4] Let sharepage update page numbers --- client/homebrew/pages/sharePage/sharePage.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 9b4f9b73d..717dabef8 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -25,7 +25,8 @@ const SharePage = createClass({ getInitialState : function() { return { - themeBundle : {} + themeBundle : {}, + currentBrewRendererPageNum : 1 }; }, @@ -39,6 +40,10 @@ const SharePage = createClass({ document.removeEventListener('keydown', this.handleControlKeys); }, + handleBrewRendererPageChange : function(pageNumber){ + this.setState({ currentBrewRendererPageNum: pageNumber }); + }, + handleControlKeys : function(e){ if(!(e.ctrlKey || e.metaKey)) return; const P_KEY = 80; @@ -117,6 +122,8 @@ const SharePage = createClass({ renderer={this.props.brew.renderer} theme={this.props.brew.theme} themeBundle={this.state.themeBundle} + onPageChange={this.handleBrewRendererPageChange} + currentBrewRendererPageNum={this.state.currentBrewRendererPageNum} allowPrint={true} />