Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11503 from Snuffleupagus/issue-11499

Browse Source 
Remove the unused `id` properties from page and thumbnail canvas/image DOM elements (issue 11499)
This commit is contained in:
Tim van der Meij 2020-01-12 19:38:17 +01:00 committed by GitHub
commit 40f531ee87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
l10n/en-US/viewer.properties
View File

@ -148,6 +148,8 @@ thumbs_label=Thumbnails
findbar.title=Find in Document findbar.title=Find in Document
findbar_label=Find findbar_label=Find
# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
page_canvas=Page {{page}}
# Thumbnails panel item (tooltip and alt text for images) # Thumbnails panel item (tooltip and alt text for images)
# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
# number. # number.

2
l10n/sv-SE/viewer.properties
View File

@ -148,6 +148,8 @@ thumbs_label=Miniatyrer
findbar.title=Sök i dokument findbar.title=Sök i dokument
findbar_label=Sök findbar_label=Sök
# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
page_canvas=Sida {{page}}
# Thumbnails panel item (tooltip and alt text for images) # Thumbnails panel item (tooltip and alt text for images)
# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
# number. # number.

6
web/pdf_page_view.js
View File

@ -559,7 +559,11 @@ class PDFPageView {
const viewport = this.viewport; const viewport = this.viewport;
const canvas = document.createElement("canvas"); const canvas = document.createElement("canvas");
canvas.id = this.renderingId; this.l10n
.get("page_canvas", { page: this.id }, "Page {{page}}")
.then(msg => {
canvas.setAttribute("aria-label", msg);
});
// Keep the canvas hidden until the first draw callback, or until drawing // Keep the canvas hidden until the first draw callback, or until drawing
// is complete when `!this.renderingQueue`, to prevent black flickering. // is complete when `!this.renderingQueue`, to prevent black flickering.

79
web/pdf_thumbnail_view.js
View File

@ -125,11 +125,9 @@ class PDFThumbnailView {
const anchor = document.createElement("a"); const anchor = document.createElement("a");
anchor.href = linkService.getAnchorUrl("#page=" + id); anchor.href = linkService.getAnchorUrl("#page=" + id);
this.l10n this._thumbPageTitle.then(msg => {
.get("thumb_page_title", { page: id }, "Page {{page}}") anchor.title = msg;
.then(msg => { });
anchor.title = msg;
});
anchor.onclick = function() { anchor.onclick = function() {
linkService.page = id; linkService.page = id;
return false; return false;
@ -258,38 +256,23 @@ class PDFThumbnailView {
if (this.renderingState !== RenderingStates.FINISHED) { if (this.renderingState !== RenderingStates.FINISHED) {
return; return;
} }
const id = this.renderingId;
const className = "thumbnailImage"; const className = "thumbnailImage";
if (this.disableCanvasToImageConversion) { if (this.disableCanvasToImageConversion) {
this.canvas.id = id;
this.canvas.className = className; this.canvas.className = className;
this.l10n this._thumbPageCanvas.then(msg => {
.get( this.canvas.setAttribute("aria-label", msg);
"thumb_page_canvas", });
{ page: this.pageId },
"Thumbnail of Page {{page}}"
)
.then(msg => {
this.canvas.setAttribute("aria-label", msg);
});
this.div.setAttribute("data-loaded", true); this.div.setAttribute("data-loaded", true);
this.ring.appendChild(this.canvas); this.ring.appendChild(this.canvas);
return; return;
} }
const image = document.createElement("img"); const image = document.createElement("img");
image.id = id;
image.className = className; image.className = className;
this.l10n this._thumbPageCanvas.then(msg => {
.get( image.setAttribute("aria-label", msg);
"thumb_page_canvas", });
{ page: this.pageId },
"Thumbnail of Page {{page}}"
)
.then(msg => {
image.setAttribute("aria-label", msg);
});
image.style.width = this.canvasWidth + "px"; image.style.width = this.canvasWidth + "px";
image.style.height = this.canvasHeight + "px"; image.style.height = this.canvasHeight + "px";
@ -455,8 +438,20 @@ class PDFThumbnailView {
this._convertCanvasToImage(); this._convertCanvasToImage();
} }
get pageId() { get _thumbPageTitle() {
return this.pageLabel !== null ? this.pageLabel : this.id; return this.l10n.get(
"thumb_page_title",
{ page: this.pageLabel !== null ? this.pageLabel : this.id },
"Page {{page}}"
);
}
get _thumbPageCanvas() {
return this.l10n.get(
"thumb_page_canvas",
{ page: this.pageLabel !== null ? this.pageLabel : this.id },
"Thumbnail of Page {{page}}"
);
} }
/** /**
@ -465,29 +460,21 @@ class PDFThumbnailView {
setPageLabel(label) { setPageLabel(label) {
this.pageLabel = typeof label === "string" ? label : null; this.pageLabel = typeof label === "string" ? label : null;
this.l10n this._thumbPageTitle.then(msg => {
.get("thumb_page_title", { page: this.pageId }, "Page {{page}}") this.anchor.title = msg;
.then(msg => { });
this.anchor.title = msg;
});
if (this.renderingState !== RenderingStates.FINISHED) { if (this.renderingState !== RenderingStates.FINISHED) {
return; return;
} }
this.l10n this._thumbPageCanvas.then(msg => {
.get( if (this.image) {
"thumb_page_canvas", this.image.setAttribute("aria-label", msg);
{ page: this.pageId }, } else if (this.disableCanvasToImageConversion && this.canvas) {
"Thumbnail of Page {{page}}" this.canvas.setAttribute("aria-label", msg);
) }
.then(ariaLabel => { });
if (this.image) {
this.image.setAttribute("aria-label", ariaLabel);
} else if (this.disableCanvasToImageConversion && this.canvas) {
this.canvas.setAttribute("aria-label", ariaLabel);
}
});
} }
static cleanup() { static cleanup() {