Skip to content

[api-minor] Change {PDFPageView, PDFThumbnailView}.update to take a parameter object #13973

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions web/base_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ class BaseViewer {

const pageNumber = this._currentPageNumber;

for (let i = 0, ii = this._pages.length; i < ii; i++) {
const pageView = this._pages[i];
pageView.update(pageView.scale, rotation);
const updateArgs = { rotation };
for (const pageView of this._pages) {
pageView.update(updateArgs);
}
// Prevent errors in case the rotation changes *before* the scale has been
// set to a non-default value.
Expand Down Expand Up @@ -717,8 +717,9 @@ class BaseViewer {
}
this._doc.style.setProperty("--zoom-factor", newScale);

for (let i = 0, ii = this._pages.length; i < ii; i++) {
this._pages[i].update(newScale);
const updateArgs = { scale: newScale };
for (const pageView of this._pages) {
pageView.update(updateArgs);
}
this._currentScale = newScale;

Expand Down Expand Up @@ -1435,8 +1436,9 @@ class BaseViewer {
}
this._optionalContentConfigPromise = promise;

const updateArgs = { optionalContentConfigPromise: promise };
for (const pageView of this._pages) {
pageView.update(pageView.scale, pageView.rotation, promise);
pageView.update(updateArgs);
}
this.update();

Expand Down
24 changes: 20 additions & 4 deletions web/pdf_page_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,27 @@ class PDFPageView {
div.appendChild(this.loadingIconDiv);
}

update(scale, rotation, optionalContentConfigPromise = null) {
update({ scale = 0, rotation = null, optionalContentConfigPromise = null }) {
if (
typeof PDFJSDev !== "undefined" &&
PDFJSDev.test("GENERIC") &&
typeof arguments[0] !== "object"
) {
console.error(
"PDFPageView.update called with separate parameters, please use an object instead."
);

this.update({
scale: arguments[0],
rotation: arguments[1],
optionalContentConfigPromise: arguments[2],
});
return;
}

this.scale = scale || this.scale;
// The rotation may be zero.
if (typeof rotation !== "undefined") {
this.rotation = rotation;
if (typeof rotation === "number") {
this.rotation = rotation; // The rotation may be zero.
}
if (optionalContentConfigPromise instanceof Promise) {
this._optionalContentConfigPromise = optionalContentConfigPromise;
Expand Down
6 changes: 3 additions & 3 deletions web/pdf_thumbnail_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ class PDFThumbnailView {
}
}

update(rotation) {
if (typeof rotation !== "undefined") {
this.rotation = rotation;
update({ rotation = null }) {
if (typeof rotation === "number") {
this.rotation = rotation; // The rotation may be zero.
}
const totalRotation = (this.rotation + this.pdfPageRotate) % 360;
this.viewport = this.viewport.clone({
Expand Down
5 changes: 3 additions & 2 deletions web/pdf_thumbnail_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ class PDFThumbnailViewer {
}
this._pagesRotation = rotation;

for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
this._thumbnails[i].update(rotation);
const updateArgs = { rotation };
for (const thumbnail of this._thumbnails) {
thumbnail.update(updateArgs);
}
}

Expand Down