mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-19 14:48:08 +02:00
Merge pull request #17964 from Snuffleupagus/addEventListener-signal
Remove *some* event listeners with `signal` in the viewer
This commit is contained in:
Tim van der Meij
GitHub
commit
5ad42c13ad
2 changed files with 140 additions and 148 deletions
195
web/app.js
195
web/app.js
|
|
@ -158,6 +158,7 @@ const PDFViewerApplication = {
|
|||
baseUrl: "",
|
||||
_downloadUrl: "",
|
||||
_boundEvents: Object.create(null),
|
||||
_windowAbortController: null,
|
||||
documentInfo: null,
|
||||
metadata: null,
|
||||
_contentDispositionFilename: null,
|
||||
|
|
@ -176,8 +177,6 @@ const PDFViewerApplication = {
|
|||
_nimbusDataPromise: null,
|
||||
_caretBrowsing: null,
|
||||
_isScrolling: false,
|
||||
_lastScrollTop: 0,
|
||||
_lastScrollLeft: 0,
|
||||
|
||||
// Called once when the document is loaded.
|
||||
async initialize(appConfig) {
|
||||
|
|
@ -1906,10 +1905,15 @@ const PDFViewerApplication = {
|
|||
},
|
||||
|
||||
bindWindowEvents() {
|
||||
if (this._windowAbortController) {
|
||||
return;
|
||||
}
|
||||
this._windowAbortController = new AbortController();
|
||||
|
||||
const {
|
||||
eventBus,
|
||||
_boundEvents,
|
||||
appConfig: { mainContainer },
|
||||
_windowAbortController: { signal },
|
||||
} = this;
|
||||
|
||||
function addWindowResolutionChange(evt = null) {
|
||||
|
|
@ -1921,58 +1925,73 @@ const PDFViewerApplication = {
|
|||
);
|
||||
mediaQueryList.addEventListener("change", addWindowResolutionChange, {
|
||||
once: true,
|
||||
signal,
|
||||
});
|
||||
|
||||
_boundEvents.removeWindowResolutionChange ||= function () {
|
||||
mediaQueryList.removeEventListener("change", addWindowResolutionChange);
|
||||
_boundEvents.removeWindowResolutionChange = null;
|
||||
};
|
||||
}
|
||||
addWindowResolutionChange();
|
||||
|
||||
_boundEvents.windowResize = () => {
|
||||
eventBus.dispatch("resize", { source: window });
|
||||
};
|
||||
_boundEvents.windowHashChange = () => {
|
||||
eventBus.dispatch("hashchange", {
|
||||
source: window,
|
||||
hash: document.location.hash.substring(1),
|
||||
});
|
||||
};
|
||||
_boundEvents.windowBeforePrint = () => {
|
||||
eventBus.dispatch("beforeprint", { source: window });
|
||||
};
|
||||
_boundEvents.windowAfterPrint = () => {
|
||||
eventBus.dispatch("afterprint", { source: window });
|
||||
};
|
||||
_boundEvents.windowUpdateFromSandbox = event => {
|
||||
eventBus.dispatch("updatefromsandbox", {
|
||||
source: window,
|
||||
detail: event.detail,
|
||||
});
|
||||
};
|
||||
|
||||
window.addEventListener("visibilitychange", webViewerVisibilityChange);
|
||||
window.addEventListener("wheel", webViewerWheel, { passive: false });
|
||||
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);
|
||||
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("click", webViewerClick, { signal });
|
||||
window.addEventListener("keydown", webViewerKeyDown, { signal });
|
||||
window.addEventListener("keyup", webViewerKeyUp, { signal });
|
||||
window.addEventListener(
|
||||
"resize",
|
||||
() => {
|
||||
eventBus.dispatch("resize", { source: window });
|
||||
},
|
||||
{ signal }
|
||||
);
|
||||
window.addEventListener(
|
||||
"hashchange",
|
||||
() => {
|
||||
eventBus.dispatch("hashchange", {
|
||||
source: window,
|
||||
hash: document.location.hash.substring(1),
|
||||
});
|
||||
},
|
||||
{ signal }
|
||||
);
|
||||
window.addEventListener(
|
||||
"beforeprint",
|
||||
() => {
|
||||
eventBus.dispatch("beforeprint", { source: window });
|
||||
},
|
||||
{ signal }
|
||||
);
|
||||
window.addEventListener(
|
||||
"afterprint",
|
||||
() => {
|
||||
eventBus.dispatch("afterprint", { source: window });
|
||||
},
|
||||
{ signal }
|
||||
);
|
||||
window.addEventListener(
|
||||
"updatefromsandbox",
|
||||
_boundEvents.windowUpdateFromSandbox
|
||||
event => {
|
||||
eventBus.dispatch("updatefromsandbox", {
|
||||
source: window,
|
||||
detail: event.detail,
|
||||
});
|
||||
},
|
||||
{ signal }
|
||||
);
|
||||
|
||||
if (
|
||||
|
|
@ -1981,39 +2000,51 @@ const PDFViewerApplication = {
|
|||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Using the values lastScrollTop and lastScrollLeft is a workaround to
|
||||
// https://bugzilla.mozilla.org/show_bug.cgi?id=1881974.
|
||||
// TODO: remove them once the bug is fixed.
|
||||
({ scrollTop: this._lastScrollTop, scrollLeft: this._lastScrollLeft } =
|
||||
mainContainer);
|
||||
const scrollend = (_boundEvents.mainContainerScrollend = () => {
|
||||
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
|
||||
// Using the values lastScrollTop and lastScrollLeft is a workaround to
|
||||
// https://bugzilla.mozilla.org/show_bug.cgi?id=1881974.
|
||||
// TODO: remove them once the bug is fixed.
|
||||
({ scrollTop: this._lastScrollTop, scrollLeft: this._lastScrollLeft } =
|
||||
mainContainer);
|
||||
}
|
||||
|
||||
const scrollend = () => {
|
||||
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
|
||||
({ scrollTop: this._lastScrollTop, scrollLeft: this._lastScrollLeft } =
|
||||
mainContainer);
|
||||
}
|
||||
|
||||
this._isScrolling = false;
|
||||
mainContainer.addEventListener("scroll", scroll, {
|
||||
passive: true,
|
||||
signal,
|
||||
});
|
||||
mainContainer.removeEventListener("scrollend", scrollend);
|
||||
mainContainer.removeEventListener("blur", scrollend);
|
||||
});
|
||||
const scroll = (_boundEvents.mainContainerScroll = () => {
|
||||
mainContainer.removeEventListener("scrollend", scrollend, { signal });
|
||||
mainContainer.removeEventListener("blur", scrollend, { signal });
|
||||
};
|
||||
const scroll = () => {
|
||||
if (this._isCtrlKeyDown) {
|
||||
return;
|
||||
}
|
||||
if (
|
||||
this._isCtrlKeyDown ||
|
||||
(this._lastScrollTop === mainContainer.scrollTop &&
|
||||
this._lastScrollLeft === mainContainer.scrollLeft)
|
||||
(typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) &&
|
||||
this._lastScrollTop === mainContainer.scrollTop &&
|
||||
this._lastScrollLeft === mainContainer.scrollLeft
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
mainContainer.removeEventListener("scroll", scroll, {
|
||||
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,
|
||||
signal,
|
||||
});
|
||||
},
|
||||
|
||||
|
|
@ -2077,54 +2108,8 @@ const PDFViewerApplication = {
|
|||
},
|
||||
|
||||
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) {
|
||||
|
|
|
|||
|
|
@ -49,6 +49,10 @@ class PDFPresentationMode {
|
|||
|
||||
#args = null;
|
||||
|
||||
#fullscreenChangeAbortController = null;
|
||||
|
||||
#windowAbortController = null;
|
||||
|
||||
/**
|
||||
* @param {PDFPresentationModeOptions} options
|
||||
*/
|
||||
|
|
@ -346,59 +350,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);
|
||||
if (this.#windowAbortController) {
|
||||
return;
|
||||
}
|
||||
this.#windowAbortController = new AbortController();
|
||||
const { signal } = this.#windowAbortController;
|
||||
|
||||
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);
|
||||
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 (/* isFullscreen = */ 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 (/* isFullscreen = */ 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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue