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

[api-minor] Ensure that the AnnotationLayer gets a default l10n-instance in GENERIC builds (PR 16552 follow-up)

Browse Source 
*This is something that I completely overlooked during review of PR 16552, despite leaving a l10n-related comment.*

The new l10n-handling of PopupAnnotations assume that the `AnnotationLayer` is always initialized with a l10n-instance, which might not actually be the case in third-party implementations where the default viewer isn't used.
To work-around that we'll now bundle, and fallback on, the existing `NullL10n`-implementation in GENERIC builds of the PDF.js library. This will only result in a slight file-size increase for the *built* `pdf.js` file, again limited to GENERIC builds, since the `web/l10n_utils.js` file has no dependencies.

Also, tweaks a couple of TESTING pre-processor checks to *only* include that code when running the reference tests.
This commit is contained in:
Jonas Jenwald 2023-06-20 16:44:09 +02:00
parent a656d71959
commit 197e806c86
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/display/annotation_layer.js
View File

@ -1943,14 +1943,10 @@ class PopupElement {
// The modification date is shown in the popup instead of the creation // The modification date is shown in the popup instead of the creation
// date if it is available and can be parsed correctly, which is // date if it is available and can be parsed correctly, which is
// consistent with other viewers such as Adobe Acrobat. // consistent with other viewers such as Adobe Acrobat.
this.#dateTimePromise = parent.l10n.get( this.#dateTimePromise = parent.l10n.get("annotation_date_string", {
"annotation_date_string", date: dateObject.toLocaleDateString(),
{ time: dateObject.toLocaleTimeString(),
date: dateObject.toLocaleDateString(), });
time: dateObject.toLocaleTimeString(),
},
"{{date}}, {{time}}"
);
} }
this.trigger = elements.flatMap(e => e.getElementsToTriggerPopup()); this.trigger = elements.flatMap(e => e.getElementsToTriggerPopup());
@ -1969,7 +1965,7 @@ class PopupElement {
this.#toggle(); this.#toggle();
} }
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) { if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING")) {
// Since the popup is lazily created, we need to ensure that it'll be // Since the popup is lazily created, we need to ensure that it'll be
// created and displayed during reference tests. // created and displayed during reference tests.
this.#parent.popupShow.push(async () => { this.#parent.popupShow.push(async () => {
@ -2788,7 +2784,14 @@ class AnnotationLayer {
this.viewport = viewport; this.viewport = viewport;
this.zIndex = 0; this.zIndex = 0;
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) { if (
typeof PDFJSDev !== "undefined" &&
PDFJSDev.test("GENERIC && !TESTING")
) {
const { NullL10n } = require("pdfjs-web/l10n_utils.js");
this.l10n ||= NullL10n;
}
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING")) {
// For testing purposes. // For testing purposes.
Object.defineProperty(this, "showPopups", { Object.defineProperty(this, "showPopups", {
value: async () => { value: async () => {

9
web/l10n_utils.js
View File

@ -13,6 +13,13 @@
* limitations under the License. * limitations under the License.
*/ */
/**
* PLEASE NOTE: This file is currently imported in both the `web/` and
* `src/display/` folders, hence be EXTREMELY careful about
* introducing any dependencies here since that can lead to an
* unexpected/unnecessary size increase of the *built* files.
*/
/** /**
* A subset of the l10n strings in the `l10n/en-US/viewer.properties` file. * A subset of the l10n strings in the `l10n/en-US/viewer.properties` file.
*/ */
@ -63,6 +70,8 @@ const DEFAULT_L10N_STRINGS = {
unexpected_response_error: "Unexpected server response.", unexpected_response_error: "Unexpected server response.",
rendering_error: "An error occurred while rendering the page.", rendering_error: "An error occurred while rendering the page.",
annotation_date_string: "{{date}}, {{time}}",
printing_not_supported: printing_not_supported:
"Warning: Printing is not fully supported by this browser.", "Warning: Printing is not fully supported by this browser.",
printing_not_ready: "Warning: The PDF is not fully loaded for printing.", printing_not_ready: "Warning: The PDF is not fully loaded for printing.",