Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions gulpfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2403,6 +2403,9 @@ function buildInternalViewer(defines, dir) {
])
)
.pipe(gulp.dest(dir + "web")),
createCMapBundle().pipe(gulp.dest(dir + "web/cmaps")),
createICCBundle().pipe(gulp.dest(dir + "web/iccs")),
createStandardFontBundle().pipe(gulp.dest(dir + "web/standard_fonts")),
createWasmBundle().pipe(gulp.dest(dir + "web/wasm")),
]);
}
Expand Down
43 changes: 43 additions & 0 deletions test/integration/reorganize_pages_spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1331,6 +1331,49 @@ describe("Reorganize Pages View", () => {
})
);
});

it("should deselect all thumbnails when the deselect button is clicked", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await waitForThumbnailVisible(page, 1);
await page.waitForSelector("#viewsManagerStatusActionButton", {
visible: true,
});

const labelSelector = "#viewsManagerStatusActionLabel";
const deselectButtonSelector =
"#viewsManagerStatusActionDeselectButton";

// Check thumbnails 1 and 2.
await waitAndClick(
page,
`.thumbnail:has(${getThumbnailSelector(1)}) input`
);
await waitAndClick(
page,
`.thumbnail:has(${getThumbnailSelector(2)}) input`
);
await waitForTextToBe(page, labelSelector, `${FSI}2${PDI} selected`);

// Click the deselect button: all thumbnails should be unchecked.
await waitAndClick(page, deselectButtonSelector);

// Label should revert to "Select pages".
await waitForTextToBe(page, labelSelector, "Select pages");

// The deselect button should be hidden again.
await page.waitForSelector(deselectButtonSelector, { hidden: true });

// All checkboxes should be unchecked.
await page.waitForSelector(
"#thumbnailsView:not(:has(input:checked))",
{
visible: true,
}
);
})
);
});
});

describe("Undo label reflects number of cut/deleted pages (bug 2010832)", () => {
Expand Down
11 changes: 8 additions & 3 deletions web/pdf_internal_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -851,10 +851,15 @@ async function openDocument(source, name) {

const loadingTask = getDocument({
...source,
cMapUrl: "../external/bcmaps/",
cMapUrl:
typeof PDFJSDev === "undefined" ? "../external/bcmaps/" : "../web/cmaps/",
iccUrl:
typeof PDFJSDev === "undefined" ? "../external/iccs/" : "../web/iccs/",
standardFontDataUrl:
typeof PDFJSDev === "undefined"
? "../external/standard_fonts/"
: "../web/standard_fonts/",
wasmUrl: "../web/wasm/",
iccUrl: "../external/iccs/",
standardFontDataUrl: "../external/standard_fonts/",
useWorkerFetch: true,
pdfBug: true,
CanvasFactory: DebugCanvasFactory,
Expand Down
12 changes: 12 additions & 0 deletions web/pdf_thumbnail_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ class PDFThumbnailViewer {

#statusBar = null;

#deselectButton = null;

#undoBar = null;

#undoLabel = null;
Expand Down Expand Up @@ -183,6 +185,8 @@ class PDFThumbnailViewer {
this.pageColors = pageColors || null;
this.#enableSplitMerge = enableSplitMerge || false;
this.#statusLabel = statusBar?.viewsManagerStatusActionLabel || null;
this.#deselectButton =
statusBar?.viewsManagerStatusActionDeselectButton || null;
this.#statusBar = statusBar?.viewsManagerStatusAction || null;
this.#undoBar = undoBar?.viewsManagerStatusUndo || null;
this.#undoLabel = undoBar?.viewsManagerStatusUndoLabel || null;
Expand Down Expand Up @@ -260,6 +264,12 @@ class PDFThumbnailViewer {
"click",
this.#dismissUndo.bind(this)
);
this.#deselectButton?.addEventListener("click", () => {
this.#clearSelection();
this.#toggleMenuEntries(false);
this.#updateStatus("select");
});
this.#deselectButton.classList.toggle("hidden", true);
} else {
manageMenu.button.hidden = true;
}
Expand Down Expand Up @@ -910,8 +920,10 @@ class PDFThumbnailViewer {
"data-l10n-args",
JSON.stringify({ count })
);
this.#deselectButton.classList.toggle("hidden", false);
} else {
this.#statusLabel.removeAttribute("data-l10n-args");
this.#deselectButton.classList.toggle("hidden", true);
}
this.#statusBar.classList.toggle("hidden", false);
this.#undoBar.classList.toggle("hidden", true);
Expand Down
21 changes: 16 additions & 5 deletions web/viewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,22 @@
</div>
<div id="viewsManagerStatus">
<div id="viewsManagerStatusAction">
<span
id="viewsManagerStatusActionLabel"
class="viewsManagerStatusLabel"
data-l10n-id="pdfjs-views-manager-pages-status-none-action-label"
></span>
<span id="viewsManagerStatusActionLabelContainer" class="viewsManagerStatusLabel">
<button
id="viewsManagerStatusActionDeselectButton"
class="hiddden"
type="button"
tabindex="0"
role="checkbox"
aria-checked="true"
aria-labelledby="viewsManagerStatusActionLabel"
></button>
<span
id="viewsManagerStatusActionLabel"
class="viewsManagerStatusLabel"
data-l10n-id="pdfjs-views-manager-pages-status-none-action-label"
></span>
</span>
<div id="actionSelector">
<button
id="viewsManagerStatusActionButton"
Expand Down
3 changes: 3 additions & 0 deletions web/viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ function getViewerConfiguration() {
viewsManagerStatusAction: document.getElementById(
"viewsManagerStatusAction"
),
viewsManagerStatusActionDeselectButton: document.getElementById(
"viewsManagerStatusActionDeselectButton"
),
viewsManagerStatusActionLabel: document.getElementById(
"viewsManagerStatusActionLabel"
),
Expand Down
7 changes: 4 additions & 3 deletions web/views_manager.css
Original file line number Diff line number Diff line change
Expand Up @@ -406,15 +406,16 @@
align-self: stretch;
background-color: var(--status-actions-bg);

> span[data-l10n-args]::before {
content: "";
display: inline-block;
#viewsManagerStatusActionLabelContainer > button {
width: var(--icon-size);
height: var(--icon-size);
mask-repeat: no-repeat;
mask-position: center;
background-color: var(--indicator-color);
mask-image: var(--pages-selected-icon);
border: none;
padding: 0;
flex: 0 0 auto;
}

#actionSelector {
Expand Down
Loading