Replace all "private" methods in PDFPresentationMode with proper ones
Now that the there's ECMAScript support for properly private methods on `class`es, we can use that instead and thus remove all of the `@private` JSDocs comments.
This commit is contained in:
Jonas Jenwald
parent
b753271ca6
commit
cadc4d2f61
@ -66,9 +66,9 @@ class PDFPresentationMode {
|
||||
if (this.switchInProgress || this.active || !this.pdfViewer.pagesCount) {
|
||||
return false;
|
||||
}
|
||||
this._addFullscreenChangeListeners();
|
||||
this._setSwitchInProgress();
|
||||
this._notifyStateChange();
|
||||
this.#addFullscreenChangeListeners();
|
||||
this.#setSwitchInProgress();
|
||||
this.#notifyStateChange();
|
||||
|
||||
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
|
||||
if (this.container.requestFullscreen) {
|
||||
@ -96,10 +96,7 @@ class PDFPresentationMode {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_mouseWheel(evt) {
|
||||
#mouseWheel(evt) {
|
||||
if (!this.active) {
|
||||
return;
|
||||
}
|
||||
@ -122,13 +119,13 @@ class PDFPresentationMode {
|
||||
(this.mouseScrollDelta > 0 && delta < 0) ||
|
||||
(this.mouseScrollDelta < 0 && delta > 0)
|
||||
) {
|
||||
this._resetMouseScrollState();
|
||||
this.#resetMouseScrollState();
|
||||
}
|
||||
this.mouseScrollDelta += delta;
|
||||
|
||||
if (Math.abs(this.mouseScrollDelta) >= PAGE_SWITCH_THRESHOLD) {
|
||||
const totalDelta = this.mouseScrollDelta;
|
||||
this._resetMouseScrollState();
|
||||
this.#resetMouseScrollState();
|
||||
const success =
|
||||
totalDelta > 0
|
||||
? this.pdfViewer.previousPage()
|
||||
@ -146,10 +143,7 @@ class PDFPresentationMode {
|
||||
return !!(document.fullscreenElement || document.webkitIsFullScreen);
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_notifyStateChange() {
|
||||
#notifyStateChange() {
|
||||
let state = PresentationModeState.NORMAL;
|
||||
if (this.switchInProgress) {
|
||||
state = PresentationModeState.CHANGING;
|
||||
@ -168,37 +162,29 @@ class PDFPresentationMode {
|
||||
* This timeout is used to prevent the current page from being scrolled
|
||||
* partially, or completely, out of view when entering Presentation Mode.
|
||||
* NOTE: This issue seems limited to certain zoom levels (e.g. page-width).
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
_setSwitchInProgress() {
|
||||
#setSwitchInProgress() {
|
||||
if (this.switchInProgress) {
|
||||
clearTimeout(this.switchInProgress);
|
||||
}
|
||||
this.switchInProgress = setTimeout(() => {
|
||||
this._removeFullscreenChangeListeners();
|
||||
this.#removeFullscreenChangeListeners();
|
||||
delete this.switchInProgress;
|
||||
this._notifyStateChange();
|
||||
this.#notifyStateChange();
|
||||
}, DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS);
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_resetSwitchInProgress() {
|
||||
#resetSwitchInProgress() {
|
||||
if (this.switchInProgress) {
|
||||
clearTimeout(this.switchInProgress);
|
||||
delete this.switchInProgress;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_enter() {
|
||||
#enter() {
|
||||
this.active = true;
|
||||
this._resetSwitchInProgress();
|
||||
this._notifyStateChange();
|
||||
this.#resetSwitchInProgress();
|
||||
this.#notifyStateChange();
|
||||
this.container.classList.add(ACTIVE_SELECTOR);
|
||||
|
||||
// Ensure that the correct page is scrolled into view when entering
|
||||
@ -210,8 +196,8 @@ class PDFPresentationMode {
|
||||
this.pdfViewer.currentScaleValue = "page-fit";
|
||||
}, 0);
|
||||
|
||||
this._addWindowListeners();
|
||||
this._showControls();
|
||||
this.#addWindowListeners();
|
||||
this.#showControls();
|
||||
this.contextMenuOpen = false;
|
||||
|
||||
// Text selection is disabled in Presentation Mode, thus it's not possible
|
||||
@ -220,10 +206,7 @@ class PDFPresentationMode {
|
||||
window.getSelection().removeAllRanges();
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_exit() {
|
||||
#exit() {
|
||||
const pageNumber = this.pdfViewer.currentPageNumber;
|
||||
this.container.classList.remove(ACTIVE_SELECTOR);
|
||||
|
||||
@ -231,8 +214,8 @@ class PDFPresentationMode {
|
||||
// Presentation Mode, by waiting until fullscreen mode is disabled.
|
||||
setTimeout(() => {
|
||||
this.active = false;
|
||||
this._removeFullscreenChangeListeners();
|
||||
this._notifyStateChange();
|
||||
this.#removeFullscreenChangeListeners();
|
||||
this.#notifyStateChange();
|
||||
|
||||
this.pdfViewer.scrollMode = this.args.scrollMode;
|
||||
this.pdfViewer.spreadMode = this.args.spreadMode;
|
||||
@ -241,16 +224,13 @@ class PDFPresentationMode {
|
||||
this.args = null;
|
||||
}, 0);
|
||||
|
||||
this._removeWindowListeners();
|
||||
this._hideControls();
|
||||
this._resetMouseScrollState();
|
||||
this.#removeWindowListeners();
|
||||
this.#hideControls();
|
||||
this.#resetMouseScrollState();
|
||||
this.contextMenuOpen = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_mouseDown(evt) {
|
||||
#mouseDown(evt) {
|
||||
if (this.contextMenuOpen) {
|
||||
this.contextMenuOpen = false;
|
||||
evt.preventDefault();
|
||||
@ -274,17 +254,11 @@ class PDFPresentationMode {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_contextMenu() {
|
||||
#contextMenu() {
|
||||
this.contextMenuOpen = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_showControls() {
|
||||
#showControls() {
|
||||
if (this.controlsTimeout) {
|
||||
clearTimeout(this.controlsTimeout);
|
||||
} else {
|
||||
@ -296,10 +270,7 @@ class PDFPresentationMode {
|
||||
}, DELAY_BEFORE_HIDING_CONTROLS);
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_hideControls() {
|
||||
#hideControls() {
|
||||
if (!this.controlsTimeout) {
|
||||
return;
|
||||
}
|
||||
@ -310,18 +281,13 @@ class PDFPresentationMode {
|
||||
|
||||
/**
|
||||
* Resets the properties used for tracking mouse scrolling events.
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
_resetMouseScrollState() {
|
||||
#resetMouseScrollState() {
|
||||
this.mouseScrollTimeStamp = 0;
|
||||
this.mouseScrollDelta = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_touchSwipe(evt) {
|
||||
#touchSwipe(evt) {
|
||||
if (!this.active) {
|
||||
return;
|
||||
}
|
||||
@ -381,16 +347,13 @@ class PDFPresentationMode {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_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);
|
||||
#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);
|
||||
@ -402,10 +365,7 @@ class PDFPresentationMode {
|
||||
window.addEventListener("touchend", this.touchSwipeBind);
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_removeWindowListeners() {
|
||||
#removeWindowListeners() {
|
||||
window.removeEventListener("mousemove", this.showControlsBind);
|
||||
window.removeEventListener("mousedown", this.mouseDownBind);
|
||||
window.removeEventListener("wheel", this.mouseWheelBind, {
|
||||
@ -425,22 +385,16 @@ class PDFPresentationMode {
|
||||
delete this.touchSwipeBind;
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_fullscreenChange() {
|
||||
#fullscreenChange() {
|
||||
if (this.isFullscreen) {
|
||||
this._enter();
|
||||
this.#enter();
|
||||
} else {
|
||||
this._exit();
|
||||
this.#exit();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_addFullscreenChangeListeners() {
|
||||
this.fullscreenChangeBind = this._fullscreenChange.bind(this);
|
||||
#addFullscreenChangeListeners() {
|
||||
this.fullscreenChangeBind = this.#fullscreenChange.bind(this);
|
||||
|
||||
window.addEventListener("fullscreenchange", this.fullscreenChangeBind);
|
||||
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
|
||||
@ -451,10 +405,7 @@ class PDFPresentationMode {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
_removeFullscreenChangeListeners() {
|
||||
#removeFullscreenChangeListeners() {
|
||||
window.removeEventListener("fullscreenchange", this.fullscreenChangeBind);
|
||||
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
|
||||
window.removeEventListener(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user