summaryrefslogtreecommitdiffstats
path: root/toolkit/components/pdfjs/content/web/viewer.mjs
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/components/pdfjs/content/web/viewer.mjs')
-rw-r--r--toolkit/components/pdfjs/content/web/viewer.mjs1004
1 files changed, 518 insertions, 486 deletions
diff --git a/toolkit/components/pdfjs/content/web/viewer.mjs b/toolkit/components/pdfjs/content/web/viewer.mjs
index 5202de12c7..12e4919428 100644
--- a/toolkit/components/pdfjs/content/web/viewer.mjs
+++ b/toolkit/components/pdfjs/content/web/viewer.mjs
@@ -808,44 +808,8 @@ const LinkTarget = {
PARENT: 3,
TOP: 4
};
-function addLinkAttributes(link, {
- url,
- target,
- rel,
- enabled = true
-} = {}) {
- if (!url || typeof url !== "string") {
- throw new Error('A valid "url" parameter must provided.');
- }
- if (enabled) {
- link.href = link.title = url;
- } else {
- link.href = "";
- link.title = `Disabled: ${url}`;
- link.onclick = () => false;
- }
- let targetStr = "";
- switch (target) {
- case LinkTarget.NONE:
- break;
- case LinkTarget.SELF:
- targetStr = "_self";
- break;
- case LinkTarget.BLANK:
- targetStr = "_blank";
- break;
- case LinkTarget.PARENT:
- targetStr = "_parent";
- break;
- case LinkTarget.TOP:
- targetStr = "_top";
- break;
- }
- link.target = targetStr;
- link.rel = typeof rel === "string" ? rel : DEFAULT_LINK_REL;
-}
class PDFLinkService {
- #pagesRefCache = new Map();
+ externalLinkEnabled = true;
constructor({
eventBus,
externalLinkTarget = null,
@@ -855,7 +819,6 @@ class PDFLinkService {
this.eventBus = eventBus;
this.externalLinkTarget = externalLinkTarget;
this.externalLinkRel = externalLinkRel;
- this.externalLinkEnabled = true;
this._ignoreDestinationZoom = ignoreDestinationZoom;
this.baseUrl = null;
this.pdfDocument = null;
@@ -865,7 +828,6 @@ class PDFLinkService {
setDocument(pdfDocument, baseUrl = null) {
this.baseUrl = baseUrl;
this.pdfDocument = pdfDocument;
- this.#pagesRefCache.clear();
}
setViewer(pdfViewer) {
this.pdfViewer = pdfViewer;
@@ -877,42 +839,56 @@ class PDFLinkService {
return this.pdfDocument ? this.pdfDocument.numPages : 0;
}
get page() {
- return this.pdfViewer.currentPageNumber;
+ return this.pdfDocument ? this.pdfViewer.currentPageNumber : 1;
}
set page(value) {
- this.pdfViewer.currentPageNumber = value;
+ if (this.pdfDocument) {
+ this.pdfViewer.currentPageNumber = value;
+ }
}
get rotation() {
- return this.pdfViewer.pagesRotation;
+ return this.pdfDocument ? this.pdfViewer.pagesRotation : 0;
}
set rotation(value) {
- this.pdfViewer.pagesRotation = value;
+ if (this.pdfDocument) {
+ this.pdfViewer.pagesRotation = value;
+ }
}
get isInPresentationMode() {
- return this.pdfViewer.isInPresentationMode;
+ return this.pdfDocument ? this.pdfViewer.isInPresentationMode : false;
}
- #goToDestinationHelper(rawDest, namedDest = null, explicitDest) {
- const destRef = explicitDest[0];
- let pageNumber;
- if (typeof destRef === "object" && destRef !== null) {
- pageNumber = this._cachedPageNumber(destRef);
+ async goToDestination(dest) {
+ if (!this.pdfDocument) {
+ return;
+ }
+ let namedDest, explicitDest, pageNumber;
+ if (typeof dest === "string") {
+ namedDest = dest;
+ explicitDest = await this.pdfDocument.getDestination(dest);
+ } else {
+ namedDest = null;
+ explicitDest = await dest;
+ }
+ if (!Array.isArray(explicitDest)) {
+ console.error(`goToDestination: "${explicitDest}" is not a valid destination array, for dest="${dest}".`);
+ return;
+ }
+ const [destRef] = explicitDest;
+ if (destRef && typeof destRef === "object") {
+ pageNumber = this.pdfDocument.cachedPageNumber(destRef);
if (!pageNumber) {
- this.pdfDocument.getPageIndex(destRef).then(pageIndex => {
- this.cachePageRef(pageIndex + 1, destRef);
- this.#goToDestinationHelper(rawDest, namedDest, explicitDest);
- }).catch(() => {
- console.error(`PDFLinkService.#goToDestinationHelper: "${destRef}" is not ` + `a valid page reference, for dest="${rawDest}".`);
- });
- return;
+ try {
+ pageNumber = (await this.pdfDocument.getPageIndex(destRef)) + 1;
+ } catch {
+ console.error(`goToDestination: "${destRef}" is not a valid page reference, for dest="${dest}".`);
+ return;
+ }
}
} else if (Number.isInteger(destRef)) {
pageNumber = destRef + 1;
- } else {
- console.error(`PDFLinkService.#goToDestinationHelper: "${destRef}" is not ` + `a valid destination reference, for dest="${rawDest}".`);
- return;
}
if (!pageNumber || pageNumber < 1 || pageNumber > this.pagesCount) {
- console.error(`PDFLinkService.#goToDestinationHelper: "${pageNumber}" is not ` + `a valid page number, for dest="${rawDest}".`);
+ console.error(`goToDestination: "${pageNumber}" is not a valid page number, for dest="${dest}".`);
return;
}
if (this.pdfHistory) {
@@ -929,24 +905,6 @@ class PDFLinkService {
ignoreDestinationZoom: this._ignoreDestinationZoom
});
}
- async goToDestination(dest) {
- if (!this.pdfDocument) {
- return;
- }
- let namedDest, explicitDest;
- if (typeof dest === "string") {
- namedDest = dest;
- explicitDest = await this.pdfDocument.getDestination(dest);
- } else {
- namedDest = null;
- explicitDest = await dest;
- }
- if (!Array.isArray(explicitDest)) {
- console.error(`PDFLinkService.goToDestination: "${explicitDest}" is not ` + `a valid destination array, for dest="${dest}".`);
- return;
- }
- this.#goToDestinationHelper(dest, namedDest, explicitDest);
- }
goToPage(val) {
if (!this.pdfDocument) {
return;
@@ -965,12 +923,37 @@ class PDFLinkService {
});
}
addLinkAttributes(link, url, newWindow = false) {
- addLinkAttributes(link, {
- url,
- target: newWindow ? LinkTarget.BLANK : this.externalLinkTarget,
- rel: this.externalLinkRel,
- enabled: this.externalLinkEnabled
- });
+ if (!url || typeof url !== "string") {
+ throw new Error('A valid "url" parameter must provided.');
+ }
+ const target = newWindow ? LinkTarget.BLANK : this.externalLinkTarget,
+ rel = this.externalLinkRel;
+ if (this.externalLinkEnabled) {
+ link.href = link.title = url;
+ } else {
+ link.href = "";
+ link.title = `Disabled: ${url}`;
+ link.onclick = () => false;
+ }
+ let targetStr = "";
+ switch (target) {
+ case LinkTarget.NONE:
+ break;
+ case LinkTarget.SELF:
+ targetStr = "_self";
+ break;
+ case LinkTarget.BLANK:
+ targetStr = "_blank";
+ break;
+ case LinkTarget.PARENT:
+ targetStr = "_parent";
+ break;
+ case LinkTarget.TOP:
+ targetStr = "_top";
+ break;
+ }
+ link.target = targetStr;
+ link.rel = typeof rel === "string" ? rel : DEFAULT_LINK_REL;
}
getDestinationHash(dest) {
if (typeof dest === "string") {
@@ -1064,13 +1047,16 @@ class PDFLinkService {
dest = dest.toString();
}
} catch {}
- if (typeof dest === "string" || PDFLinkService.#isValidExplicitDestination(dest)) {
+ if (typeof dest === "string" || PDFLinkService.#isValidExplicitDest(dest)) {
this.goToDestination(dest);
return;
}
console.error(`PDFLinkService.setHash: "${unescape(hash)}" is not a valid destination.`);
}
executeNamedAction(action) {
+ if (!this.pdfDocument) {
+ return;
+ }
switch (action) {
case "GoBack":
this.pdfHistory?.back();
@@ -1099,64 +1085,48 @@ class PDFLinkService {
});
}
async executeSetOCGState(action) {
- const pdfDocument = this.pdfDocument;
- const optionalContentConfig = await this.pdfViewer.optionalContentConfigPromise;
+ if (!this.pdfDocument) {
+ return;
+ }
+ const pdfDocument = this.pdfDocument,
+ optionalContentConfig = await this.pdfViewer.optionalContentConfigPromise;
if (pdfDocument !== this.pdfDocument) {
return;
}
optionalContentConfig.setOCGState(action);
this.pdfViewer.optionalContentConfigPromise = Promise.resolve(optionalContentConfig);
}
- cachePageRef(pageNum, pageRef) {
- if (!pageRef) {
- return;
- }
- const refStr = pageRef.gen === 0 ? `${pageRef.num}R` : `${pageRef.num}R${pageRef.gen}`;
- this.#pagesRefCache.set(refStr, pageNum);
- }
- _cachedPageNumber(pageRef) {
- if (!pageRef) {
- return null;
- }
- const refStr = pageRef.gen === 0 ? `${pageRef.num}R` : `${pageRef.num}R${pageRef.gen}`;
- return this.#pagesRefCache.get(refStr) || null;
- }
- static #isValidExplicitDestination(dest) {
- if (!Array.isArray(dest)) {
+ static #isValidExplicitDest(dest) {
+ if (!Array.isArray(dest) || dest.length < 2) {
return false;
}
- const destLength = dest.length;
- if (destLength < 2) {
+ const [page, zoom, ...args] = dest;
+ if (!(typeof page === "object" && Number.isInteger(page?.num) && Number.isInteger(page?.gen)) && !Number.isInteger(page)) {
return false;
}
- const page = dest[0];
- if (!(typeof page === "object" && Number.isInteger(page.num) && Number.isInteger(page.gen)) && !(Number.isInteger(page) && page >= 0)) {
- return false;
- }
- const zoom = dest[1];
- if (!(typeof zoom === "object" && typeof zoom.name === "string")) {
+ if (!(typeof zoom === "object" && typeof zoom?.name === "string")) {
return false;
}
let allowNull = true;
switch (zoom.name) {
case "XYZ":
- if (destLength !== 5) {
+ if (args.length !== 3) {
return false;
}
break;
case "Fit":
case "FitB":
- return destLength === 2;
+ return args.length === 0;
case "FitH":
case "FitBH":
case "FitV":
case "FitBV":
- if (destLength !== 3) {
+ if (args.length !== 1) {
return false;
}
break;
case "FitR":
- if (destLength !== 6) {
+ if (args.length !== 4) {
return false;
}
allowNull = false;
@@ -1164,51 +1134,16 @@ class PDFLinkService {
default:
return false;
}
- for (let i = 2; i < destLength; i++) {
- const param = dest[i];
- if (!(typeof param === "number" || allowNull && param === null)) {
+ for (const arg of args) {
+ if (!(typeof arg === "number" || allowNull && arg === null)) {
return false;
}
}
return true;
}
}
-class SimpleLinkService {
- constructor() {
- this.externalLinkEnabled = true;
- }
- get pagesCount() {
- return 0;
- }
- get page() {
- return 0;
- }
- set page(value) {}
- get rotation() {
- return 0;
- }
- set rotation(value) {}
- get isInPresentationMode() {
- return false;
- }
- async goToDestination(dest) {}
- goToPage(val) {}
- addLinkAttributes(link, url, newWindow = false) {
- addLinkAttributes(link, {
- url,
- enabled: this.externalLinkEnabled
- });
- }
- getDestinationHash(dest) {
- return "#";
- }
- getAnchorUrl(hash) {
- return "#";
- }
- setHash(hash) {}
- executeNamedAction(action) {}
- executeSetOCGState(action) {}
- cachePageRef(pageNum, pageRef) {}
+class SimpleLinkService extends PDFLinkService {
+ setDocument(pdfDocument, baseUrl = null) {}
}
;// CONCATENATED MODULE: ./web/pdfjs.js
@@ -1277,25 +1212,17 @@ async function waitOnEventOrTimeout({
promise,
resolve
} = Promise.withResolvers();
+ const ac = new AbortController();
function handler(type) {
- if (target instanceof EventBus) {
- target._off(name, eventHandler);
- } else {
- target.removeEventListener(name, eventHandler);
- }
- if (timeout) {
- clearTimeout(timeout);
- }
+ ac.abort();
+ clearTimeout(timeout);
resolve(type);
}
- const eventHandler = handler.bind(null, WaitOnType.EVENT);
- if (target instanceof EventBus) {
- target._on(name, eventHandler);
- } else {
- target.addEventListener(name, eventHandler);
- }
- const timeoutHandler = handler.bind(null, WaitOnType.TIMEOUT);
- const timeout = setTimeout(timeoutHandler, delay);
+ const evtMethod = target instanceof EventBus ? "_on" : "addEventListener";
+ target[evtMethod](name, handler.bind(null, WaitOnType.EVENT), {
+ signal: ac.signal
+ });
+ const timeout = setTimeout(handler.bind(null, WaitOnType.TIMEOUT), delay);
return promise;
}
class EventBus {
@@ -1303,14 +1230,12 @@ class EventBus {
on(eventName, listener, options = null) {
this._on(eventName, listener, {
external: true,
- once: options?.once
+ once: options?.once,
+ signal: options?.signal
});
}
off(eventName, listener, options = null) {
- this._off(eventName, listener, {
- external: true,
- once: options?.once
- });
+ this._off(eventName, listener);
}
dispatch(eventName, data) {
const eventListeners = this.#listeners[eventName];
@@ -1340,11 +1265,25 @@ class EventBus {
}
}
_on(eventName, listener, options = null) {
+ let rmAbort = null;
+ if (options?.signal instanceof AbortSignal) {
+ const {
+ signal
+ } = options;
+ if (signal.aborted) {
+ console.error("Cannot use an `aborted` signal.");
+ return;
+ }
+ const onAbort = () => this._off(eventName, listener);
+ rmAbort = () => signal.removeEventListener("abort", onAbort);
+ signal.addEventListener("abort", onAbort);
+ }
const eventListeners = this.#listeners[eventName] ||= [];
eventListeners.push({
listener,
external: options?.external === true,
- once: options?.once === true
+ once: options?.once === true,
+ rmAbort
});
}
_off(eventName, listener, options = null) {
@@ -1353,7 +1292,9 @@ class EventBus {
return;
}
for (let i = 0, ii = eventListeners.length; i < ii; i++) {
- if (eventListeners[i].listener === listener) {
+ const evt = eventListeners[i];
+ if (evt.listener === listener) {
+ evt.rmAbort?.();
eventListeners.splice(i, 1);
return;
}
@@ -2663,8 +2604,12 @@ class PDFAttachmentViewer extends BaseTreeViewer {
}
_bindLink(element, {
content,
+ description,
filename
}) {
+ if (description) {
+ element.title = description;
+ }
element.onclick = () => {
this.downloadManager.openOrDownloadData(content, filename);
return false;
@@ -2687,12 +2632,14 @@ class PDFAttachmentViewer extends BaseTreeViewer {
for (const name in attachments) {
const item = attachments[name];
const content = item.content,
+ description = item.description,
filename = getFilenameFromUrl(item.filename, true);
const div = document.createElement("div");
div.className = "treeItem";
const element = document.createElement("a");
this._bindLink(element, {
content,
+ description,
filename
});
element.textContent = this._normalizeTextContent(filename);
@@ -2704,7 +2651,8 @@ class PDFAttachmentViewer extends BaseTreeViewer {
}
#appendAttachment({
filename,
- content
+ content,
+ description
}) {
const renderedPromise = this._renderedCapability.promise;
renderedPromise.then(() => {
@@ -2719,7 +2667,8 @@ class PDFAttachmentViewer extends BaseTreeViewer {
}
attachments[filename] = {
filename,
- content
+ content,
+ description
};
this.render({
attachments,
@@ -2881,7 +2830,13 @@ class PDFCursorTools {
}
#addEventListeners() {
this.eventBus._on("switchcursortool", evt => {
- this.switchTool(evt.tool);
+ if (!evt.reset) {
+ this.switchTool(evt.tool);
+ } else if (this.#prevActive !== null) {
+ annotationEditorMode = AnnotationEditorType.NONE;
+ presentationModeState = PresentationModeState.NORMAL;
+ enableActive();
+ }
});
let annotationEditorMode = AnnotationEditorType.NONE,
presentationModeState = PresentationModeState.NORMAL;
@@ -2897,13 +2852,6 @@ class PDFCursorTools {
this.switchTool(prevActive);
}
};
- this.eventBus._on("secondarytoolbarreset", evt => {
- if (this.#prevActive !== null) {
- annotationEditorMode = AnnotationEditorType.NONE;
- presentationModeState = PresentationModeState.NORMAL;
- enableActive();
- }
- });
this.eventBus._on("annotationeditormodechanged", ({
mode
}) => {
@@ -4103,6 +4051,7 @@ function getCurrentHash() {
return document.location.hash;
}
class PDFHistory {
+ #eventAbortController = null;
constructor({
linkService,
eventBus
@@ -4112,7 +4061,6 @@ class PDFHistory {
this._initialized = false;
this._fingerprint = "";
this.reset();
- this._boundEvents = null;
this.eventBus._on("pagesinit", () => {
this._isPagesLoaded = false;
this.eventBus._on("pagesloaded", evt => {
@@ -4138,7 +4086,7 @@ class PDFHistory {
this._fingerprint = fingerprint;
this._updateUrl = updateUrl === true;
this._initialized = true;
- this._bindEvents();
+ this.#bindEvents();
const state = window.history.state;
this._popStateInProgress = false;
this._blockHashChange = 0;
@@ -4147,17 +4095,17 @@ class PDFHistory {
this._uid = this._maxUid = 0;
this._destination = null;
this._position = null;
- if (!this._isValidState(state, true) || resetHistory) {
+ if (!this.#isValidState(state, true) || resetHistory) {
const {
hash,
page,
rotation
- } = this._parseCurrentHash(true);
+ } = this.#parseCurrentHash(true);
if (!hash || reInitialized || resetHistory) {
- this._pushOrReplaceState(null, true);
+ this.#pushOrReplaceState(null, true);
return;
}
- this._pushOrReplaceState({
+ this.#pushOrReplaceState({
hash,
page,
rotation
@@ -4165,7 +4113,7 @@ class PDFHistory {
return;
}
const destination = state.destination;
- this._updateInternalState(destination, state.uid, true);
+ this.#updateInternalState(destination, state.uid, true);
if (destination.rotation !== undefined) {
this._initialRotation = destination.rotation;
}
@@ -4180,9 +4128,9 @@ class PDFHistory {
}
reset() {
if (this._initialized) {
- this._pageHide();
+ this.#pageHide();
this._initialized = false;
- this._unbindEvents();
+ this.#unbindEvents();
}
if (this._updateViewareaTimeout) {
clearTimeout(this._updateViewareaTimeout);
@@ -4205,7 +4153,7 @@ class PDFHistory {
} else if (!Array.isArray(explicitDest)) {
console.error("PDFHistory.push: " + `"${explicitDest}" is not a valid explicitDest parameter.`);
return;
- } else if (!this._isValidPage(pageNumber)) {
+ } else if (!this.#isValidPage(pageNumber)) {
if (pageNumber !== null || this._destination) {
console.error("PDFHistory.push: " + `"${pageNumber}" is not a valid pageNumber parameter.`);
return;
@@ -4225,7 +4173,7 @@ class PDFHistory {
if (this._popStateInProgress && !forceReplace) {
return;
}
- this._pushOrReplaceState({
+ this.#pushOrReplaceState({
dest: explicitDest,
hash,
page: pageNumber,
@@ -4242,7 +4190,7 @@ class PDFHistory {
if (!this._initialized) {
return;
}
- if (!this._isValidPage(pageNumber)) {
+ if (!this.#isValidPage(pageNumber)) {
console.error(`PDFHistory.pushPage: "${pageNumber}" is not a valid page number.`);
return;
}
@@ -4252,7 +4200,7 @@ class PDFHistory {
if (this._popStateInProgress) {
return;
}
- this._pushOrReplaceState({
+ this.#pushOrReplaceState({
dest: null,
hash: `page=${pageNumber}`,
page: pageNumber,
@@ -4269,14 +4217,14 @@ class PDFHistory {
if (!this._initialized || this._popStateInProgress) {
return;
}
- this._tryPushCurrentPosition();
+ this.#tryPushCurrentPosition();
}
back() {
if (!this._initialized || this._popStateInProgress) {
return;
}
const state = window.history.state;
- if (this._isValidState(state) && state.uid > 0) {
+ if (this.#isValidState(state) && state.uid > 0) {
window.history.back();
}
}
@@ -4285,7 +4233,7 @@ class PDFHistory {
return;
}
const state = window.history.state;
- if (this._isValidState(state) && state.uid < this._maxUid) {
+ if (this.#isValidState(state) && state.uid < this._maxUid) {
window.history.forward();
}
}
@@ -4298,14 +4246,14 @@ class PDFHistory {
get initialRotation() {
return this._initialized ? this._initialRotation : null;
}
- _pushOrReplaceState(destination, forceReplace = false) {
+ #pushOrReplaceState(destination, forceReplace = false) {
const shouldReplace = forceReplace || !this._destination;
const newState = {
fingerprint: this._fingerprint,
uid: shouldReplace ? this._uid : this._uid + 1,
destination
};
- this._updateInternalState(destination, newState.uid);
+ this.#updateInternalState(destination, newState.uid);
let newUrl;
if (this._updateUrl && destination?.hash) {
const baseUrl = document.location.href.split("#", 1)[0];
@@ -4319,7 +4267,7 @@ class PDFHistory {
window.history.pushState(newState, "", newUrl);
}
}
- _tryPushCurrentPosition(temporary = false) {
+ #tryPushCurrentPosition(temporary = false) {
if (!this._position) {
return;
}
@@ -4329,11 +4277,11 @@ class PDFHistory {
position.temporary = true;
}
if (!this._destination) {
- this._pushOrReplaceState(position);
+ this.#pushOrReplaceState(position);
return;
}
if (this._destination.temporary) {
- this._pushOrReplaceState(position, true);
+ this.#pushOrReplaceState(position, true);
return;
}
if (this._destination.hash === position.hash) {
@@ -4349,12 +4297,12 @@ class PDFHistory {
}
forceReplace = true;
}
- this._pushOrReplaceState(position, forceReplace);
+ this.#pushOrReplaceState(position, forceReplace);
}
- _isValidPage(val) {
+ #isValidPage(val) {
return Number.isInteger(val) && val > 0 && val <= this.linkService.pagesCount;
}
- _isValidState(state, checkReload = false) {
+ #isValidState(state, checkReload = false) {
if (!state) {
return false;
}
@@ -4379,7 +4327,7 @@ class PDFHistory {
}
return true;
}
- _updateInternalState(destination, uid, removeTemporary = false) {
+ #updateInternalState(destination, uid, removeTemporary = false) {
if (this._updateViewareaTimeout) {
clearTimeout(this._updateViewareaTimeout);
this._updateViewareaTimeout = null;
@@ -4392,12 +4340,12 @@ class PDFHistory {
this._maxUid = Math.max(this._maxUid, uid);
this._numPositionUpdates = 0;
}
- _parseCurrentHash(checkNameddest = false) {
+ #parseCurrentHash(checkNameddest = false) {
const hash = unescape(getCurrentHash()).substring(1);
const params = parseQueryString(hash);
const nameddest = params.get("nameddest") || "";
let page = params.get("page") | 0;
- if (!this._isValidPage(page) || checkNameddest && nameddest.length > 0) {
+ if (!this.#isValidPage(page) || checkNameddest && nameddest.length > 0) {
page = null;
}
return {
@@ -4406,7 +4354,7 @@ class PDFHistory {
rotation: this.linkService.rotation
};
}
- _updateViewarea({
+ #updateViewarea({
location
}) {
if (this._updateViewareaTimeout) {
@@ -4428,13 +4376,13 @@ class PDFHistory {
if (UPDATE_VIEWAREA_TIMEOUT > 0) {
this._updateViewareaTimeout = setTimeout(() => {
if (!this._popStateInProgress) {
- this._tryPushCurrentPosition(true);
+ this.#tryPushCurrentPosition(true);
}
this._updateViewareaTimeout = null;
}, UPDATE_VIEWAREA_TIMEOUT);
}
}
- _popState({
+ #popState({
state
}) {
const newHash = getCurrentHash(),
@@ -4446,15 +4394,15 @@ class PDFHistory {
hash,
page,
rotation
- } = this._parseCurrentHash();
- this._pushOrReplaceState({
+ } = this.#parseCurrentHash();
+ this.#pushOrReplaceState({
hash,
page,
rotation
}, true);
return;
}
- if (!this._isValidState(state)) {
+ if (!this.#isValidState(state)) {
return;
}
this._popStateInProgress = true;
@@ -4469,7 +4417,7 @@ class PDFHistory {
});
}
const destination = state.destination;
- this._updateInternalState(destination, state.uid, true);
+ this.#updateInternalState(destination, state.uid, true);
if (isValidRotation(destination.rotation)) {
this.linkService.rotation = destination.rotation;
}
@@ -4484,32 +4432,32 @@ class PDFHistory {
this._popStateInProgress = false;
});
}
- _pageHide() {
+ #pageHide() {
if (!this._destination || this._destination.temporary) {
- this._tryPushCurrentPosition();
+ this.#tryPushCurrentPosition();
}
}
- _bindEvents() {
- if (this._boundEvents) {
+ #bindEvents() {
+ if (this.#eventAbortController) {
return;
}
- this._boundEvents = {
- updateViewarea: this._updateViewarea.bind(this),
- popState: this._popState.bind(this),
- pageHide: this._pageHide.bind(this)
- };
- this.eventBus._on("updateviewarea", this._boundEvents.updateViewarea);
- window.addEventListener("popstate", this._boundEvents.popState);
- window.addEventListener("pagehide", this._boundEvents.pageHide);
+ this.#eventAbortController = new AbortController();
+ const {
+ signal
+ } = this.#eventAbortController;
+ this.eventBus._on("updateviewarea", this.#updateViewarea.bind(this), {
+ signal
+ });
+ window.addEventListener("popstate", this.#popState.bind(this), {
+ signal
+ });
+ window.addEventListener("pagehide", this.#pageHide.bind(this), {
+ signal
+ });
}
- _unbindEvents() {
- if (!this._boundEvents) {
- return;
- }
- this.eventBus._off("updateviewarea", this._boundEvents.updateViewarea);
- window.removeEventListener("popstate", this._boundEvents.popState);
- window.removeEventListener("pagehide", this._boundEvents.pageHide);
- this._boundEvents = null;
+ #unbindEvents() {
+ this.#eventAbortController?.abort();
+ this.#eventAbortController = null;
}
}
function isDestHashesEqual(destHash, pushHash) {
@@ -4955,17 +4903,8 @@ class PDFOutlineViewer extends BaseTreeViewer {
}
if (Array.isArray(explicitDest)) {
const [destRef] = explicitDest;
- if (typeof destRef === "object" && destRef !== null) {
- pageNumber = this.linkService._cachedPageNumber(destRef);
- if (!pageNumber) {
- try {
- pageNumber = (await pdfDocument.getPageIndex(destRef)) + 1;
- if (pdfDocument !== this._pdfDocument) {
- return null;
- }
- this.linkService.cachePageRef(pageNumber, destRef);
- } catch {}
- }
+ if (destRef && typeof destRef === "object") {
+ pageNumber = pdfDocument.cachedPageNumber(destRef);
} else if (Number.isInteger(destRef)) {
pageNumber = destRef + 1;
}
@@ -5001,6 +4940,8 @@ const SWIPE_ANGLE_THRESHOLD = Math.PI / 6;
class PDFPresentationMode {
#state = PresentationModeState.UNKNOWN;
#args = null;
+ #fullscreenChangeAbortController = null;
+ #windowAbortController = null;
constructor({
container,
pdfViewer,
@@ -5220,55 +5161,62 @@ class PDFPresentationMode {
}
}
#addWindowListeners() {
- this.showControlsBind = this.#showControls.bind(this);
- this.mouseDownBind = this.#mouseDown.bind(this);
- this.mouseWheelBind = this.#mouseWheel.bind(this);
- this.resetMouseScrollStateBind = this.#resetMouseScrollState.bind(this);
- this.contextMenuBind = this.#contextMenu.bind(this);
- this.touchSwipeBind = this.#touchSwipe.bind(this);
- window.addEventListener("mousemove", this.showControlsBind);
- window.addEventListener("mousedown", this.mouseDownBind);
- window.addEventListener("wheel", this.mouseWheelBind, {
- passive: false
- });
- window.addEventListener("keydown", this.resetMouseScrollStateBind);
- window.addEventListener("contextmenu", this.contextMenuBind);
- window.addEventListener("touchstart", this.touchSwipeBind);
- window.addEventListener("touchmove", this.touchSwipeBind);
- window.addEventListener("touchend", this.touchSwipeBind);
+ if (this.#windowAbortController) {
+ return;
+ }
+ this.#windowAbortController = new AbortController();
+ const {
+ signal
+ } = this.#windowAbortController;
+ const touchSwipeBind = this.#touchSwipe.bind(this);
+ window.addEventListener("mousemove", this.#showControls.bind(this), {
+ signal
+ });
+ window.addEventListener("mousedown", this.#mouseDown.bind(this), {
+ signal
+ });
+ window.addEventListener("wheel", this.#mouseWheel.bind(this), {
+ passive: false,
+ signal
+ });
+ window.addEventListener("keydown", this.#resetMouseScrollState.bind(this), {
+ signal
+ });
+ window.addEventListener("contextmenu", this.#contextMenu.bind(this), {
+ signal
+ });
+ window.addEventListener("touchstart", touchSwipeBind, {
+ signal
+ });
+ window.addEventListener("touchmove", touchSwipeBind, {
+ signal
+ });
+ window.addEventListener("touchend", touchSwipeBind, {
+ signal
+ });
}
#removeWindowListeners() {
- window.removeEventListener("mousemove", this.showControlsBind);
- window.removeEventListener("mousedown", this.mouseDownBind);
- window.removeEventListener("wheel", this.mouseWheelBind, {
- passive: false
- });
- window.removeEventListener("keydown", this.resetMouseScrollStateBind);
- window.removeEventListener("contextmenu", this.contextMenuBind);
- window.removeEventListener("touchstart", this.touchSwipeBind);
- window.removeEventListener("touchmove", this.touchSwipeBind);
- window.removeEventListener("touchend", this.touchSwipeBind);
- delete this.showControlsBind;
- delete this.mouseDownBind;
- delete this.mouseWheelBind;
- delete this.resetMouseScrollStateBind;
- delete this.contextMenuBind;
- delete this.touchSwipeBind;
- }
- #fullscreenChange() {
- if (document.fullscreenElement) {
- this.#enter();
- } else {
- this.#exit();
- }
+ this.#windowAbortController?.abort();
+ this.#windowAbortController = null;
}
#addFullscreenChangeListeners() {
- this.fullscreenChangeBind = this.#fullscreenChange.bind(this);
- window.addEventListener("fullscreenchange", this.fullscreenChangeBind);
+ if (this.#fullscreenChangeAbortController) {
+ return;
+ }
+ this.#fullscreenChangeAbortController = new AbortController();
+ window.addEventListener("fullscreenchange", () => {
+ if (document.fullscreenElement) {
+ this.#enter();
+ } else {
+ this.#exit();
+ }
+ }, {
+ signal: this.#fullscreenChangeAbortController.signal
+ });
}
#removeFullscreenChangeListeners() {
- window.removeEventListener("fullscreenchange", this.fullscreenChangeBind);
- delete this.fullscreenChangeBind;
+ this.#fullscreenChangeAbortController?.abort();
+ this.#fullscreenChangeAbortController = null;
}
}
@@ -5610,6 +5558,7 @@ class PDFScriptingManager {
#closeCapability = null;
#destroyCapability = null;
#docProperties = null;
+ #eventAbortController = null;
#eventBus = null;
#externalServices = null;
#pdfDocument = null;
@@ -5652,15 +5601,24 @@ class PDFScriptingManager {
await this.#destroyScripting();
return;
}
- this._internalEvents.set("updatefromsandbox", event => {
+ const eventBus = this.#eventBus;
+ this.#eventAbortController = new AbortController();
+ const {
+ signal
+ } = this.#eventAbortController;
+ eventBus._on("updatefromsandbox", event => {
if (event?.source === window) {
this.#updateFromSandbox(event.detail);
}
+ }, {
+ signal
});
- this._internalEvents.set("dispatcheventinsandbox", event => {
+ eventBus._on("dispatcheventinsandbox", event => {
this.#scripting?.dispatchEventInSandbox(event.detail);
+ }, {
+ signal
});
- this._internalEvents.set("pagechanging", ({
+ eventBus._on("pagechanging", ({
pageNumber,
previous
}) => {
@@ -5669,8 +5627,10 @@ class PDFScriptingManager {
}
this.#dispatchPageClose(previous);
this.#dispatchPageOpen(pageNumber);
+ }, {
+ signal
});
- this._internalEvents.set("pagerendered", ({
+ eventBus._on("pagerendered", ({
pageNumber
}) => {
if (!this._pageOpenPending.has(pageNumber)) {
@@ -5680,18 +5640,19 @@ class PDFScriptingManager {
return;
}
this.#dispatchPageOpen(pageNumber);
+ }, {
+ signal
});
- this._internalEvents.set("pagesdestroy", async () => {
+ eventBus._on("pagesdestroy", async () => {
await this.#dispatchPageClose(this.#pdfViewer.currentPageNumber);
await this.#scripting?.dispatchEventInSandbox({
id: "doc",
name: "WillClose"
});
this.#closeCapability?.resolve();
+ }, {
+ signal
});
- for (const [name, listener] of this._internalEvents) {
- this.#eventBus._on(name, listener);
- }
try {
const docProperties = await this.#docProperties(pdfDocument);
if (pdfDocument !== this.#pdfDocument) {
@@ -5709,7 +5670,7 @@ class PDFScriptingManager {
actions: docActions
}
});
- this.#eventBus.dispatch("sandboxcreated", {
+ eventBus.dispatch("sandboxcreated", {
source: this
});
} catch (error) {
@@ -5770,9 +5731,6 @@ class PDFScriptingManager {
get ready() {
return this.#ready;
}
- get _internalEvents() {
- return shadow(this, "_internalEvents", new Map());
- }
get _pageOpenPending() {
return shadow(this, "_pageOpenPending", new Set());
}
@@ -5948,10 +5906,8 @@ class PDFScriptingManager {
} catch {}
this.#willPrintCapability?.reject(new Error("Scripting destroyed."));
this.#willPrintCapability = null;
- for (const [name, listener] of this._internalEvents) {
- this.#eventBus._off(name, listener);
- }
- this._internalEvents.clear();
+ this.#eventAbortController?.abort();
+ this.#eventAbortController = null;
this._pageOpenPending.clear();
this._visitedPages.clear();
this.#scripting = null;
@@ -6858,7 +6814,7 @@ class AnnotationEditorLayerBuilder {
class AnnotationLayerBuilder {
#onAppend = null;
- #onPresentationModeChanged = null;
+ #eventAbortController = null;
constructor({
pdfPage,
linkService,
@@ -6871,6 +6827,7 @@ class AnnotationLayerBuilder {
fieldObjectsPromise = null,
annotationCanvasMap = null,
accessibilityManager = null,
+ annotationEditorUIManager = null,
onAppend = null
}) {
this.pdfPage = pdfPage;
@@ -6884,6 +6841,7 @@ class AnnotationLayerBuilder {
this._fieldObjectsPromise = fieldObjectsPromise || Promise.resolve(null);
this._annotationCanvasMap = annotationCanvasMap;
this._accessibilityManager = accessibilityManager;
+ this._annotationEditorUIManager = annotationEditorUIManager;
this.#onAppend = onAppend;
this.annotationLayer = null;
this.div = null;
@@ -6919,6 +6877,7 @@ class AnnotationLayerBuilder {
div,
accessibilityManager: this._accessibilityManager,
annotationCanvasMap: this._annotationCanvasMap,
+ annotationEditorUIManager: this._annotationEditorUIManager,
page: this.pdfPage,
viewport: viewport.clone({
dontFlip: true
@@ -6938,19 +6897,19 @@ class AnnotationLayerBuilder {
if (this.linkService.isInPresentationMode) {
this.#updatePresentationModeState(PresentationModeState.FULLSCREEN);
}
- if (!this.#onPresentationModeChanged) {
- this.#onPresentationModeChanged = evt => {
+ if (!this.#eventAbortController) {
+ this.#eventAbortController = new AbortController();
+ this._eventBus?._on("presentationmodechanged", evt => {
this.#updatePresentationModeState(evt.state);
- };
- this._eventBus?._on("presentationmodechanged", this.#onPresentationModeChanged);
+ }, {
+ signal: this.#eventAbortController.signal
+ });
}
}
cancel() {
this._cancelled = true;
- if (this.#onPresentationModeChanged) {
- this._eventBus?._off("presentationmodechanged", this.#onPresentationModeChanged);
- this.#onPresentationModeChanged = null;
- }
+ this.#eventAbortController?.abort();
+ this.#eventAbortController = null;
}
hide() {
if (!this.div) {
@@ -7281,6 +7240,7 @@ class TextAccessibilityManager {
;// CONCATENATED MODULE: ./web/text_highlighter.js
class TextHighlighter {
+ #eventAbortController = null;
constructor({
findController,
eventBus,
@@ -7290,7 +7250,6 @@ class TextHighlighter {
this.matches = [];
this.eventBus = eventBus;
this.pageIdx = pageIndex;
- this._onUpdateTextLayerMatches = null;
this.textDivs = null;
this.textContentItemsStr = null;
this.enabled = false;
@@ -7307,13 +7266,15 @@ class TextHighlighter {
throw new Error("TextHighlighter is already enabled.");
}
this.enabled = true;
- if (!this._onUpdateTextLayerMatches) {
- this._onUpdateTextLayerMatches = evt => {
+ if (!this.#eventAbortController) {
+ this.#eventAbortController = new AbortController();
+ this.eventBus._on("updatetextlayermatches", evt => {
if (evt.pageIndex === this.pageIdx || evt.pageIndex === -1) {
this._updateMatches();
}
- };
- this.eventBus._on("updatetextlayermatches", this._onUpdateTextLayerMatches);
+ }, {
+ signal: this.#eventAbortController.signal
+ });
}
this._updateMatches();
}
@@ -7322,10 +7283,8 @@ class TextHighlighter {
return;
}
this.enabled = false;
- if (this._onUpdateTextLayerMatches) {
- this.eventBus._off("updatetextlayermatches", this._onUpdateTextLayerMatches);
- this._onUpdateTextLayerMatches = null;
- }
+ this.#eventAbortController?.abort();
+ this.#eventAbortController = null;
this._updateMatches(true);
}
_convertMatches(matches, matchesLength) {
@@ -8236,6 +8195,7 @@ class PDFPageView {
if (!this.annotationLayer && this.#annotationMode !== AnnotationMode.DISABLE) {
const {
annotationStorage,
+ annotationEditorUIManager,
downloadManager,
enableScripting,
fieldObjectsPromise,
@@ -8255,6 +8215,7 @@ class PDFPageView {
fieldObjectsPromise,
annotationCanvasMap: this._annotationCanvasMap,
accessibilityManager: this._accessibilityManager,
+ annotationEditorUIManager,
onAppend: annotationLayerDiv => {
this.#addLayer(annotationLayerDiv, "annotationLayer");
}
@@ -8492,7 +8453,7 @@ class PDFViewer {
#scaleTimeoutId = null;
#textLayerMode = TextLayerMode.ENABLE;
constructor(options) {
- const viewerVersion = "4.1.379";
+ const viewerVersion = "4.3.8";
if (version !== viewerVersion) {
throw new Error(`The API version "${version}" does not match the Viewer version "${viewerVersion}".`);
}
@@ -8922,11 +8883,7 @@ class PDFViewer {
});
this._pages.push(pageView);
}
- const firstPageView = this._pages[0];
- if (firstPageView) {
- firstPageView.setPdfPage(firstPdfPage);
- this.linkService.cachePageRef(1, firstPdfPage.ref);
- }
+ this._pages[0]?.setPdfPage(firstPdfPage);
if (this._scrollMode === ScrollMode.PAGE) {
this.#ensurePageViewVisible();
} else if (this._spreadMode !== SpreadMode.NONE) {
@@ -8960,7 +8917,6 @@ class PDFViewer {
if (!pageView.pdfPage) {
pageView.setPdfPage(pdfPage);
}
- this.linkService.cachePageRef(pageNum, pdfPage.ref);
if (--getPagesLeft === 0) {
this._pagesCapability.resolve();
}
@@ -9467,9 +9423,6 @@ class PDFViewer {
if (!pageView.pdfPage) {
pageView.setPdfPage(pdfPage);
}
- if (!this.linkService._cachedPageNumber?.(pdfPage.ref)) {
- this.linkService.cachePageRef(pageView.id, pdfPage.ref);
- }
return pdfPage;
} catch (reason) {
console.error("Unable to get page for page view", reason);
@@ -10030,6 +9983,10 @@ class SecondaryToolbar {
this.pageNumber = 0;
this.pagesCount = 0;
this.#updateUIState();
+ this.eventBus.dispatch("switchcursortool", {
+ source: this,
+ reset: true
+ });
this.#scrollModeChanged({
mode: ScrollMode.VERTICAL
});
@@ -10571,7 +10528,8 @@ const PDFViewerApplication = {
url: "",
baseUrl: "",
_downloadUrl: "",
- _boundEvents: Object.create(null),
+ _eventBusAbortController: null,
+ _windowAbortController: null,
documentInfo: null,
metadata: null,
_contentDispositionFilename: null,
@@ -10590,8 +10548,6 @@ const PDFViewerApplication = {
_nimbusDataPromise: null,
_caretBrowsing: null,
_isScrolling: false,
- _lastScrollTop: 0,
- _lastScrollLeft: 0,
async initialize(appConfig) {
let l10nPromise;
l10nPromise = this.externalServices.createL10n();
@@ -10715,7 +10671,6 @@ const PDFViewerApplication = {
const container = appConfig.mainContainer,
viewer = appConfig.viewerContainer;
const annotationEditorMode = AppOptions.get("annotationEditorMode");
- const isOffscreenCanvasSupported = AppOptions.get("isOffscreenCanvasSupported") && FeatureTest.isOffscreenCanvasSupported;
const pageColors = AppOptions.get("forcePageColors") || window.matchMedia("(forced-colors: active)").matches ? {
background: AppOptions.get("pageColorsBackground"),
foreground: AppOptions.get("pageColorsForeground")
@@ -10770,7 +10725,7 @@ const PDFViewerApplication = {
}
if (appConfig.annotationEditorParams) {
if (annotationEditorMode !== AnnotationEditorType.DISABLE) {
- if (AppOptions.get("enableStampEditor") && isOffscreenCanvasSupported) {
+ if (AppOptions.get("enableStampEditor")) {
appConfig.toolbar?.editorStampButton?.classList.remove("hidden");
}
const editorHighlightButton = appConfig.toolbar?.editorHighlightButton;
@@ -11635,65 +11590,160 @@ const PDFViewerApplication = {
window.print();
},
bindEvents() {
+ if (this._eventBusAbortController) {
+ return;
+ }
+ this._eventBusAbortController = new AbortController();
const {
eventBus,
- _boundEvents
+ _eventBusAbortController: {
+ signal
+ }
} = this;
- _boundEvents.beforePrint = this.beforePrint.bind(this);
- _boundEvents.afterPrint = this.afterPrint.bind(this);
- eventBus._on("resize", webViewerResize);
- eventBus._on("hashchange", webViewerHashchange);
- eventBus._on("beforeprint", _boundEvents.beforePrint);
- eventBus._on("afterprint", _boundEvents.afterPrint);
- eventBus._on("pagerender", webViewerPageRender);
- eventBus._on("pagerendered", webViewerPageRendered);
- eventBus._on("updateviewarea", webViewerUpdateViewarea);
- eventBus._on("pagechanging", webViewerPageChanging);
- eventBus._on("scalechanging", webViewerScaleChanging);
- eventBus._on("rotationchanging", webViewerRotationChanging);
- eventBus._on("sidebarviewchanged", webViewerSidebarViewChanged);
- eventBus._on("pagemode", webViewerPageMode);
- eventBus._on("namedaction", webViewerNamedAction);
- eventBus._on("presentationmodechanged", webViewerPresentationModeChanged);
- eventBus._on("presentationmode", webViewerPresentationMode);
- eventBus._on("switchannotationeditormode", webViewerSwitchAnnotationEditorMode);
- eventBus._on("switchannotationeditorparams", webViewerSwitchAnnotationEditorParams);
- eventBus._on("print", webViewerPrint);
- eventBus._on("download", webViewerDownload);
- eventBus._on("firstpage", webViewerFirstPage);
- eventBus._on("lastpage", webViewerLastPage);
- eventBus._on("nextpage", webViewerNextPage);
- eventBus._on("previouspage", webViewerPreviousPage);
- eventBus._on("zoomin", webViewerZoomIn);
- eventBus._on("zoomout", webViewerZoomOut);
- eventBus._on("zoomreset", webViewerZoomReset);
- eventBus._on("pagenumberchanged", webViewerPageNumberChanged);
- eventBus._on("scalechanged", webViewerScaleChanged);
- eventBus._on("rotatecw", webViewerRotateCw);
- eventBus._on("rotateccw", webViewerRotateCcw);
- eventBus._on("optionalcontentconfig", webViewerOptionalContentConfig);
- eventBus._on("switchscrollmode", webViewerSwitchScrollMode);
- eventBus._on("scrollmodechanged", webViewerScrollModeChanged);
- eventBus._on("switchspreadmode", webViewerSwitchSpreadMode);
- eventBus._on("spreadmodechanged", webViewerSpreadModeChanged);
- eventBus._on("documentproperties", webViewerDocumentProperties);
- eventBus._on("findfromurlhash", webViewerFindFromUrlHash);
- eventBus._on("updatefindmatchescount", webViewerUpdateFindMatchesCount);
- eventBus._on("updatefindcontrolstate", webViewerUpdateFindControlState);
+ eventBus._on("resize", webViewerResize, {
+ signal
+ });
+ eventBus._on("hashchange", webViewerHashchange, {
+ signal
+ });
+ eventBus._on("beforeprint", this.beforePrint.bind(this), {
+ signal
+ });
+ eventBus._on("afterprint", this.afterPrint.bind(this), {
+ signal
+ });
+ eventBus._on("pagerender", webViewerPageRender, {
+ signal
+ });
+ eventBus._on("pagerendered", webViewerPageRendered, {
+ signal
+ });
+ eventBus._on("updateviewarea", webViewerUpdateViewarea, {
+ signal
+ });
+ eventBus._on("pagechanging", webViewerPageChanging, {
+ signal
+ });
+ eventBus._on("scalechanging", webViewerScaleChanging, {
+ signal
+ });
+ eventBus._on("rotationchanging", webViewerRotationChanging, {
+ signal
+ });
+ eventBus._on("sidebarviewchanged", webViewerSidebarViewChanged, {
+ signal
+ });
+ eventBus._on("pagemode", webViewerPageMode, {
+ signal
+ });
+ eventBus._on("namedaction", webViewerNamedAction, {
+ signal
+ });
+ eventBus._on("presentationmodechanged", webViewerPresentationModeChanged, {
+ signal
+ });
+ eventBus._on("presentationmode", webViewerPresentationMode, {
+ signal
+ });
+ eventBus._on("switchannotationeditormode", webViewerSwitchAnnotationEditorMode, {
+ signal
+ });
+ eventBus._on("switchannotationeditorparams", webViewerSwitchAnnotationEditorParams, {
+ signal
+ });
+ eventBus._on("print", webViewerPrint, {
+ signal
+ });
+ eventBus._on("download", webViewerDownload, {
+ signal
+ });
+ eventBus._on("firstpage", webViewerFirstPage, {
+ signal
+ });
+ eventBus._on("lastpage", webViewerLastPage, {
+ signal
+ });
+ eventBus._on("nextpage", webViewerNextPage, {
+ signal
+ });
+ eventBus._on("previouspage", webViewerPreviousPage, {
+ signal
+ });
+ eventBus._on("zoomin", webViewerZoomIn, {
+ signal
+ });
+ eventBus._on("zoomout", webViewerZoomOut, {
+ signal
+ });
+ eventBus._on("zoomreset", webViewerZoomReset, {
+ signal
+ });
+ eventBus._on("pagenumberchanged", webViewerPageNumberChanged, {
+ signal
+ });
+ eventBus._on("scalechanged", webViewerScaleChanged, {
+ signal
+ });
+ eventBus._on("rotatecw", webViewerRotateCw, {
+ signal
+ });
+ eventBus._on("rotateccw", webViewerRotateCcw, {
+ signal
+ });
+ eventBus._on("optionalcontentconfig", webViewerOptionalContentConfig, {
+ signal
+ });
+ eventBus._on("switchscrollmode", webViewerSwitchScrollMode, {
+ signal
+ });
+ eventBus._on("scrollmodechanged", webViewerScrollModeChanged, {
+ signal
+ });
+ eventBus._on("switchspreadmode", webViewerSwitchSpreadMode, {
+ signal
+ });
+ eventBus._on("spreadmodechanged", webViewerSpreadModeChanged, {
+ signal
+ });
+ eventBus._on("documentproperties", webViewerDocumentProperties, {
+ signal
+ });
+ eventBus._on("findfromurlhash", webViewerFindFromUrlHash, {
+ signal
+ });
+ eventBus._on("updatefindmatchescount", webViewerUpdateFindMatchesCount, {
+ signal
+ });
+ eventBus._on("updatefindcontrolstate", webViewerUpdateFindControlState, {
+ signal
+ });
if (AppOptions.get("pdfBug")) {
- _boundEvents.reportPageStatsPDFBug = reportPageStatsPDFBug;
- eventBus._on("pagerendered", _boundEvents.reportPageStatsPDFBug);
- eventBus._on("pagechanging", _boundEvents.reportPageStatsPDFBug);
+ eventBus._on("pagerendered", reportPageStatsPDFBug, {
+ signal
+ });
+ eventBus._on("pagechanging", reportPageStatsPDFBug, {
+ signal
+ });
}
- eventBus._on("annotationeditorstateschanged", webViewerAnnotationEditorStatesChanged);
- eventBus._on("reporttelemetry", webViewerReportTelemetry);
+ eventBus._on("annotationeditorstateschanged", webViewerAnnotationEditorStatesChanged, {
+ signal
+ });
+ eventBus._on("reporttelemetry", webViewerReportTelemetry, {
+ signal
+ });
},
bindWindowEvents() {
+ if (this._windowAbortController) {
+ return;
+ }
+ this._windowAbortController = new AbortController();
const {
eventBus,
- _boundEvents,
appConfig: {
mainContainer
+ },
+ _windowAbortController: {
+ signal
}
} = this;
function addWindowResolutionChange(evt = null) {
@@ -11702,135 +11752,117 @@ const PDFViewerApplication = {
}
const mediaQueryList = window.matchMedia(`(resolution: ${window.devicePixelRatio || 1}dppx)`);
mediaQueryList.addEventListener("change", addWindowResolutionChange, {
- once: true
+ once: true,
+ signal
});
- _boundEvents.removeWindowResolutionChange ||= function () {
- mediaQueryList.removeEventListener("change", addWindowResolutionChange);
- _boundEvents.removeWindowResolutionChange = null;
- };
}
addWindowResolutionChange();
- _boundEvents.windowResize = () => {
+ window.addEventListener("visibilitychange", webViewerVisibilityChange, {
+ signal
+ });
+ window.addEventListener("wheel", webViewerWheel, {
+ passive: false,
+ signal
+ });
+ window.addEventListener("touchstart", webViewerTouchStart, {
+ passive: false,
+ signal
+ });
+ window.addEventListener("touchmove", webViewerTouchMove, {
+ passive: false,
+ signal
+ });
+ window.addEventListener("touchend", webViewerTouchEnd, {
+ passive: false,
+ signal
+ });
+ window.addEventListener("click", webViewerClick, {
+ signal
+ });
+ window.addEventListener("keydown", webViewerKeyDown, {
+ signal
+ });
+ window.addEventListener("keyup", webViewerKeyUp, {
+ signal
+ });
+ window.addEventListener("resize", () => {
eventBus.dispatch("resize", {
source: window
});
- };
- _boundEvents.windowHashChange = () => {
+ }, {
+ signal
+ });
+ window.addEventListener("hashchange", () => {
eventBus.dispatch("hashchange", {
source: window,
hash: document.location.hash.substring(1)
});
- };
- _boundEvents.windowBeforePrint = () => {
+ }, {
+ signal
+ });
+ window.addEventListener("beforeprint", () => {
eventBus.dispatch("beforeprint", {
source: window
});
- };
- _boundEvents.windowAfterPrint = () => {
+ }, {
+ signal
+ });
+ window.addEventListener("afterprint", () => {
eventBus.dispatch("afterprint", {
source: window
});
- };
- _boundEvents.windowUpdateFromSandbox = event => {
+ }, {
+ signal
+ });
+ window.addEventListener("updatefromsandbox", event => {
eventBus.dispatch("updatefromsandbox", {
source: window,
detail: event.detail
});
- };
- window.addEventListener("visibilitychange", webViewerVisibilityChange);
- window.addEventListener("wheel", webViewerWheel, {
- passive: false
- });
- window.addEventListener("touchstart", webViewerTouchStart, {
- passive: false
- });
- window.addEventListener("touchmove", webViewerTouchMove, {
- passive: false
+ }, {
+ signal
});
- window.addEventListener("touchend", webViewerTouchEnd, {
- passive: false
- });
- window.addEventListener("click", webViewerClick);
- window.addEventListener("keydown", webViewerKeyDown);
- window.addEventListener("keyup", webViewerKeyUp);
- window.addEventListener("resize", _boundEvents.windowResize);
- window.addEventListener("hashchange", _boundEvents.windowHashChange);
- window.addEventListener("beforeprint", _boundEvents.windowBeforePrint);
- window.addEventListener("afterprint", _boundEvents.windowAfterPrint);
- window.addEventListener("updatefromsandbox", _boundEvents.windowUpdateFromSandbox);
- ({
- scrollTop: this._lastScrollTop,
- scrollLeft: this._lastScrollLeft
- } = mainContainer);
- const scrollend = _boundEvents.mainContainerScrollend = () => {
- ({
- scrollTop: this._lastScrollTop,
- scrollLeft: this._lastScrollLeft
- } = mainContainer);
+ const scrollend = () => {
this._isScrolling = false;
mainContainer.addEventListener("scroll", scroll, {
- passive: true
+ passive: true,
+ signal
+ });
+ mainContainer.removeEventListener("scrollend", scrollend, {
+ signal
+ });
+ mainContainer.removeEventListener("blur", scrollend, {
+ signal
});
- mainContainer.removeEventListener("scrollend", scrollend);
- mainContainer.removeEventListener("blur", scrollend);
};
- const scroll = _boundEvents.mainContainerScroll = () => {
- if (this._isCtrlKeyDown || this._lastScrollTop === mainContainer.scrollTop && this._lastScrollLeft === mainContainer.scrollLeft) {
+ const scroll = () => {
+ if (this._isCtrlKeyDown) {
return;
}
mainContainer.removeEventListener("scroll", scroll, {
- passive: true
+ passive: true,
+ signal
});
this._isScrolling = true;
- mainContainer.addEventListener("scrollend", scrollend);
- mainContainer.addEventListener("blur", scrollend);
+ mainContainer.addEventListener("scrollend", scrollend, {
+ signal
+ });
+ mainContainer.addEventListener("blur", scrollend, {
+ signal
+ });
};
mainContainer.addEventListener("scroll", scroll, {
- passive: true
+ passive: true,
+ signal
});
},
unbindEvents() {
- throw new Error("Not implemented: unbindEvents");
+ this._eventBusAbortController?.abort();
+ this._eventBusAbortController = null;
},
unbindWindowEvents() {
- const {
- _boundEvents,
- appConfig: {
- mainContainer
- }
- } = this;
- window.removeEventListener("visibilitychange", webViewerVisibilityChange);
- window.removeEventListener("wheel", webViewerWheel, {
- passive: false
- });
- window.removeEventListener("touchstart", webViewerTouchStart, {
- passive: false
- });
- window.removeEventListener("touchmove", webViewerTouchMove, {
- passive: false
- });
- window.removeEventListener("touchend", webViewerTouchEnd, {
- passive: false
- });
- window.removeEventListener("click", webViewerClick);
- window.removeEventListener("keydown", webViewerKeyDown);
- window.removeEventListener("keyup", webViewerKeyUp);
- window.removeEventListener("resize", _boundEvents.windowResize);
- window.removeEventListener("hashchange", _boundEvents.windowHashChange);
- window.removeEventListener("beforeprint", _boundEvents.windowBeforePrint);
- window.removeEventListener("afterprint", _boundEvents.windowAfterPrint);
- window.removeEventListener("updatefromsandbox", _boundEvents.windowUpdateFromSandbox);
- mainContainer.removeEventListener("scroll", _boundEvents.mainContainerScroll);
- mainContainer.removeEventListener("scrollend", _boundEvents.mainContainerScrollend);
- mainContainer.removeEventListener("blur", _boundEvents.mainContainerScrollend);
- _boundEvents.removeWindowResolutionChange?.();
- _boundEvents.windowResize = null;
- _boundEvents.windowHashChange = null;
- _boundEvents.windowBeforePrint = null;
- _boundEvents.windowAfterPrint = null;
- _boundEvents.windowUpdateFromSandbox = null;
- _boundEvents.mainContainerScroll = null;
- _boundEvents.mainContainerScrollend = null;
+ this._windowAbortController?.abort();
+ this._windowAbortController = null;
},
_accumulateTicks(ticks, prop) {
if (this[prop] > 0 && ticks < 0 || this[prop] < 0 && ticks > 0) {
@@ -12631,8 +12663,8 @@ function webViewerReportTelemetry({
-const pdfjsVersion = "4.1.379";
-const pdfjsBuild = "017e49244";
+const pdfjsVersion = "4.3.8";
+const pdfjsBuild = "c419c8333";
const AppConstants = null;
window.PDFViewerApplication = PDFViewerApplication;
window.PDFViewerApplicationConstants = AppConstants;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 03:32:53 +0000