Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean-up the PDFViewer.{increaseScale, decreaseScale} methods #16171

Merged
merged 1 commit into from
Mar 19, 2023
Merged

Clean-up the PDFViewer.{increaseScale, decreaseScale} methods #16171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 21 additions & 46 deletions web/pdf_viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,83 +2003,58 @@ class PDFViewer {
}

/**
* Increase the current zoom level one, or more, times.
* @param {Object|null} [options]
* @typedef {Object} ChangeScaleOptions
* @property {number} [drawingDelay]
* @property {number} [scaleFactor]
* @property {number} [steps]
*/
increaseScale(options = null) {
if (
(typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
typeof options === "number"
) {
console.error(
"The `increaseScale` method-signature was updated, please use an object instead."
);
options = { steps: options };
}

/**
* Increase the current zoom level one, or more, times.
* @param {ChangeScaleOptions} [options]
*/
increaseScale({ drawingDelay, scaleFactor, steps } = {}) {
if (!this.pdfDocument) {
return;
}

options ||= Object.create(null);

let newScale = this._currentScale;
if (options.scaleFactor > 1) {
if (scaleFactor > 1) {
newScale = Math.min(
MAX_SCALE,
Math.round(newScale * options.scaleFactor * 100) / 100
Math.round(newScale * scaleFactor * 100) / 100
);
} else {
let steps = options.steps ?? 1;
steps ??= 1;
do {
newScale = (newScale * DEFAULT_SCALE_DELTA).toFixed(2);
newScale = Math.ceil(newScale * 10) / 10;
newScale = Math.min(MAX_SCALE, newScale);
newScale = Math.min(MAX_SCALE, Math.ceil(newScale * 10) / 10);
} while (--steps > 0 && newScale < MAX_SCALE);
}

options.noScroll = false;
this._setScale(newScale, options);
this._setScale(newScale, { noScroll: false, drawingDelay });
}

/**
* Decrease the current zoom level one, or more, times.
* @param {Object|null} [options]
* @param {ChangeScaleOptions} [options]
*/
decreaseScale(options = null) {
if (
(typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
typeof options === "number"
) {
console.error(
"The `decreaseScale` method-signature was updated, please use an object instead."
);
options = { steps: options };
}

decreaseScale({ drawingDelay, scaleFactor, steps } = {}) {
if (!this.pdfDocument) {
return;
}

options ||= Object.create(null);

let newScale = this._currentScale;
if (options.scaleFactor > 0 && options.scaleFactor < 1) {
if (scaleFactor > 0 && scaleFactor < 1) {
newScale = Math.max(
MIN_SCALE,
Math.round(newScale * options.scaleFactor * 100) / 100
Math.round(newScale * scaleFactor * 100) / 100
);
} else {
let steps = options.steps ?? 1;
steps ??= 1;
do {
newScale = (newScale / DEFAULT_SCALE_DELTA).toFixed(2);
newScale = Math.floor(newScale * 10) / 10;
newScale = Math.max(MIN_SCALE, newScale);
newScale = Math.max(MIN_SCALE, Math.floor(newScale * 10) / 10);
} while (--steps > 0 && newScale > MIN_SCALE);
}

options.noScroll = false;
this._setScale(newScale, options);
this._setScale(newScale, { noScroll: false, drawingDelay });
}

#updateContainerHeightCss(height = this.container.clientHeight) {
Expand Down