Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15720 from Snuffleupagus/issue-15695

Browse Source 
Ensure that the initial document position is always correct with non-default Scroll/Spread modes (issue 15695)
This commit is contained in:
Tim van der Meij 2022-11-26 13:05:54 +01:00 committed by GitHub
commit 0766898d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/pdf_viewer.js
View File

@ -1023,10 +1023,12 @@ class PDFViewer {
#scrollIntoView(pageView, pageSpot = null) { #scrollIntoView(pageView, pageSpot = null) {
const { div, id } = pageView; const { div, id } = pageView;
if (this._scrollMode === ScrollMode.PAGE) { // Ensure that `this._currentPageNumber` is correct, when `#scrollIntoView`
// Ensure that `this._currentPageNumber` is correct. // is called directly (and not from `#resetCurrentPageView`).
if (this._currentPageNumber !== id) {
this._setCurrentPageNumber(id); this._setCurrentPageNumber(id);
}
if (this._scrollMode === ScrollMode.PAGE) {
this.#ensurePageViewVisible(); this.#ensurePageViewVisible();
// Ensure that rendering always occurs, to avoid showing a blank page, // Ensure that rendering always occurs, to avoid showing a blank page,
// even if the current position doesn't change when the page is scrolled. // even if the current position doesn't change when the page is scrolled.
@ -1046,6 +1048,15 @@ class PDFViewer {
} }
} }
scrollIntoView(div, pageSpot); scrollIntoView(div, pageSpot);
// Ensure that the correct *initial* document position is set, when any
// OpenParameters are used, for documents with non-default Scroll/Spread
// modes (fixes issue 15695). This is necessary since the scroll-handler
// invokes the `update`-method asynchronously, and `this._location` could
// thus be wrong when the initial zooming occurs in the default viewer.
if (!this._currentScaleValue && this._location) {
this._location = null;
}
} }
/** /**