From ee89bd1c39c39327df0a4837728d5a9e30734ad9 Mon Sep 17 00:00:00 2001 From: Calixte Denizet Date: Tue, 17 Sep 2024 18:08:03 +0200 Subject: [PATCH] Rename the toolbar buttons in order to free their current names which can then be used for their future parent container. This patch aims to simplify a bit the patch in #18385. --- test/integration/accessibility_spec.mjs | 2 +- test/integration/find_spec.mjs | 8 +++---- test/integration/freetext_editor_spec.mjs | 4 ++-- test/integration/scripting_spec.mjs | 4 ++-- test/integration/test_utils.mjs | 2 +- web/viewer.css | 26 +++++++++++------------ web/viewer.html | 26 +++++++++++------------ web/viewer.js | 26 +++++++++++------------ 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/test/integration/accessibility_spec.mjs b/test/integration/accessibility_spec.mjs index f3e8e39cb4246..ad07e43fd9fb7 100644 --- a/test/integration/accessibility_spec.mjs +++ b/test/integration/accessibility_spec.mjs @@ -96,7 +96,7 @@ describe("accessibility", () => { .toBeTrue(); const handle = await waitForPageRendered(page); - await page.click(`#zoom${i < 4 ? "In" : "Out"}`); + await page.click(`#zoom${i < 4 ? "In" : "Out"}Button`); await awaitPromise(handle); } }) diff --git a/test/integration/find_spec.mjs b/test/integration/find_spec.mjs index 3e84abcbad830..4fca69c5f6412 100644 --- a/test/integration/find_spec.mjs +++ b/test/integration/find_spec.mjs @@ -40,8 +40,8 @@ describe("find bar", () => { await Promise.all( pages.map(async ([browserName, page]) => { // Highlight all occurrences of the letter A (case insensitive). - await page.click("#viewFind"); - await page.waitForSelector("#viewFind", { hidden: false }); + await page.click("#viewFindButton"); + await page.waitForSelector("#viewFindButton", { hidden: false }); await page.type("#findInput", "a"); await page.click("#findHighlightAll"); await page.waitForSelector(".textLayer .highlight"); @@ -100,8 +100,8 @@ describe("find bar", () => { it("must search xfa correctly", async () => { await Promise.all( pages.map(async ([browserName, page]) => { - await page.click("#viewFind"); - await page.waitForSelector("#viewFind", { hidden: false }); + await page.click("#viewFindButton"); + await page.waitForSelector("#viewFindButton", { hidden: false }); await page.type("#findInput", "preferences"); await page.waitForSelector("#findInput[data-status='']"); await page.waitForSelector(".xfaLayer .highlight"); diff --git a/test/integration/freetext_editor_spec.mjs b/test/integration/freetext_editor_spec.mjs index 99292260f1ae7..fcf7839e6a368 100644 --- a/test/integration/freetext_editor_spec.mjs +++ b/test/integration/freetext_editor_spec.mjs @@ -2741,7 +2741,7 @@ describe("FreeText Editor", () => { it("must create an editor from the toolbar", async () => { await Promise.all( pages.map(async ([browserName, page]) => { - await page.focus("#editorFreeText"); + await page.focus("#editorFreeTextButton"); await page.keyboard.press("Enter"); let selectorEditor = getEditorSelector(0); @@ -2772,7 +2772,7 @@ describe("FreeText Editor", () => { // Disable editing mode. await switchToFreeText(page, /* disable = */ true); - await page.focus("#editorFreeText"); + await page.focus("#editorFreeTextButton"); await page.keyboard.press(" "); selectorEditor = getEditorSelector(1); await page.waitForSelector(selectorEditor, { diff --git a/test/integration/scripting_spec.mjs b/test/integration/scripting_spec.mjs index 57b0c52e65112..cf010758f668b 100644 --- a/test/integration/scripting_spec.mjs +++ b/test/integration/scripting_spec.mjs @@ -462,7 +462,7 @@ describe("Interaction", () => { page, getSelector("47R"), async () => { - await page.click("#print"); + await page.click("#printButton"); } ); expect(text).withContext(`In ${browserName}`).toEqual("WillPrint"); @@ -509,7 +509,7 @@ describe("Interaction", () => { page, getSelector("47R"), async () => { - await page.click("#download"); + await page.click("#downloadButton"); } ); expect(text).withContext(`In ${browserName}`).toEqual("WillSave"); diff --git a/test/integration/test_utils.mjs b/test/integration/test_utils.mjs index 3d14f5b92fadc..66673867d65cf 100644 --- a/test/integration/test_utils.mjs +++ b/test/integration/test_utils.mjs @@ -749,7 +749,7 @@ async function switchToEditor(name, page, disable = false) { { once: true } ); }); - await page.click(`#editor${name}`); + await page.click(`#editor${name}Button`); name = name.toLowerCase(); await page.waitForSelector( ".annotationEditorLayer" + diff --git a/web/viewer.css b/web/viewer.css index 68e777c013c50..462e7ac4b43b1 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -778,12 +778,12 @@ body { background-color: var(--toolbar-icon-hover-bg-color); } -#sidebarToggle::before { +#sidebarToggleButton::before { mask-image: var(--toolbarButton-sidebarToggle-icon); transform: scaleX(var(--dir-factor)); } -#secondaryToolbarToggle::before { +#secondaryToolbarToggleButton::before { mask-image: var(--toolbarButton-secondaryToolbarToggle-icon); transform: scaleX(var(--dir-factor)); } @@ -796,35 +796,35 @@ body { mask-image: var(--toolbarButton-pageDown-icon); } -#zoomOut::before { +#zoomOutButton::before { mask-image: var(--toolbarButton-zoomOut-icon); } -#zoomIn::before { +#zoomInButton::before { mask-image: var(--toolbarButton-zoomIn-icon); } -#editorFreeText::before { +#editorFreeTextButton::before { mask-image: var(--toolbarButton-editorFreeText-icon); } -#editorHighlight::before { +#editorHighlightButton::before { mask-image: var(--toolbarButton-editorHighlight-icon); } -#editorInk::before { +#editorInkButton::before { mask-image: var(--toolbarButton-editorInk-icon); } -#editorStamp::before { +#editorStampButton::before { mask-image: var(--toolbarButton-editorStamp-icon); } -#print::before { +#printButton::before { mask-image: var(--toolbarButton-print-icon); } -#download::before { +#downloadButton::before { mask-image: var(--toolbarButton-download-icon); } @@ -850,7 +850,7 @@ body { transform: scaleX(var(--dir-factor)); } -#viewFind::before { +#viewFindButton::before { mask-image: var(--toolbarButton-search-icon); } @@ -1443,11 +1443,11 @@ dialog :link { } } - #findPrevious::before { + #findPreviousButton::before { mask-image: var(--findbarButton-previous-icon); } - #findNext::before { + #findNextButton::before { mask-image: var(--findbarButton-next-icon); } } diff --git a/web/viewer.html b/web/viewer.html index 9fa087ddaac85..33004b7a2b787 100644 --- a/web/viewer.html +++ b/web/viewer.html @@ -145,11 +145,11 @@
-
-
@@ -340,11 +340,11 @@
-
-
@@ -363,43 +363,43 @@
- - - -
- -
-
-
-
diff --git a/web/viewer.js b/web/viewer.js index 5f93fa321c489..9a6ab555a11d9 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -47,31 +47,31 @@ function getViewerConfiguration() { customScaleOption: document.getElementById("customScaleOption"), previous: document.getElementById("previous"), next: document.getElementById("next"), - zoomIn: document.getElementById("zoomIn"), - zoomOut: document.getElementById("zoomOut"), - print: document.getElementById("print"), - editorFreeTextButton: document.getElementById("editorFreeText"), + zoomIn: document.getElementById("zoomInButton"), + zoomOut: document.getElementById("zoomOutButton"), + print: document.getElementById("printButton"), + editorFreeTextButton: document.getElementById("editorFreeTextButton"), editorFreeTextParamsToolbar: document.getElementById( "editorFreeTextParamsToolbar" ), - editorHighlightButton: document.getElementById("editorHighlight"), + editorHighlightButton: document.getElementById("editorHighlightButton"), editorHighlightParamsToolbar: document.getElementById( "editorHighlightParamsToolbar" ), editorHighlightColorPicker: document.getElementById( "editorHighlightColorPicker" ), - editorInkButton: document.getElementById("editorInk"), + editorInkButton: document.getElementById("editorInkButton"), editorInkParamsToolbar: document.getElementById("editorInkParamsToolbar"), - editorStampButton: document.getElementById("editorStamp"), + editorStampButton: document.getElementById("editorStampButton"), editorStampParamsToolbar: document.getElementById( "editorStampParamsToolbar" ), - download: document.getElementById("download"), + download: document.getElementById("downloadButton"), }, secondaryToolbar: { toolbar: document.getElementById("secondaryToolbar"), - toggleButton: document.getElementById("secondaryToolbarToggle"), + toggleButton: document.getElementById("secondaryToolbarToggleButton"), presentationModeButton: document.getElementById("presentationMode"), openFileButton: typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC") @@ -105,7 +105,7 @@ function getViewerConfiguration() { // Divs (and sidebar button) outerContainer: document.getElementById("outerContainer"), sidebarContainer: document.getElementById("sidebarContainer"), - toggleButton: document.getElementById("sidebarToggle"), + toggleButton: document.getElementById("sidebarToggleButton"), resizer: document.getElementById("sidebarResizer"), // Buttons thumbnailButton: document.getElementById("viewThumbnail"), @@ -122,7 +122,7 @@ function getViewerConfiguration() { }, findBar: { bar: document.getElementById("findbar"), - toggleButton: document.getElementById("viewFind"), + toggleButton: document.getElementById("viewFindButton"), findField: document.getElementById("findInput"), highlightAllCheckbox: document.getElementById("findHighlightAll"), caseSensitiveCheckbox: document.getElementById("findMatchCase"), @@ -130,8 +130,8 @@ function getViewerConfiguration() { entireWordCheckbox: document.getElementById("findEntireWord"), findMsg: document.getElementById("findMsg"), findResultsCount: document.getElementById("findResultsCount"), - findPreviousButton: document.getElementById("findPrevious"), - findNextButton: document.getElementById("findNext"), + findPreviousButton: document.getElementById("findPreviousButton"), + findNextButton: document.getElementById("findNextButton"), }, passwordOverlay: { dialog: document.getElementById("passwordDialog"),