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

Merge pull request #14280 from Snuffleupagus/scrollMode-PAGE-spread-loop

Browse Source 
Slightly optimize `spreadMode` toggling with `ScrollMode.PAGE` set (PR 14112 follow-up)
This commit is contained in:
Tim van der Meij 2021-11-17 19:46:30 +01:00 committed by GitHub
commit f90eebd282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/base_viewer.js
View File

@ -616,9 +616,8 @@ class BaseViewer {
} }
if (this._scrollMode === ScrollMode.PAGE) { if (this._scrollMode === ScrollMode.PAGE) {
// Since the pages are placed in a `DocumentFragment`, ensure that // Ensure that the current page becomes visible on document load.
// the current page becomes visible upon loading of the document. this.#ensurePageViewVisible();
this._ensurePageViewVisible();
} else if (this._spreadMode !== SpreadMode.NONE) { } else if (this._spreadMode !== SpreadMode.NONE) {
this._updateSpreadMode(); this._updateSpreadMode();
} }
@ -744,9 +743,9 @@ class BaseViewer {
this._updateScrollMode(); this._updateScrollMode();
} }
_ensurePageViewVisible() { #ensurePageViewVisible() {
if (this._scrollMode !== ScrollMode.PAGE) { if (this._scrollMode !== ScrollMode.PAGE) {
throw new Error("_ensurePageViewVisible: Invalid scrollMode value."); throw new Error("#ensurePageViewVisible: Invalid scrollMode value.");
} }
const pageNumber = this._currentPageNumber, const pageNumber = this._currentPageNumber,
state = this.#scrollModePageState, state = this.#scrollModePageState,
@ -780,8 +779,9 @@ class BaseViewer {
// Finally, append the new pages to the viewer and apply the spreadMode. // Finally, append the new pages to the viewer and apply the spreadMode.
let spread = null; let spread = null;
for (let i = 0, ii = this._pages.length; i < ii; ++i) { for (const i of pageIndexSet) {
if (!pageIndexSet.has(i)) { const pageView = this._pages[i];
if (!pageView) {
continue; continue;
} }
if (spread === null) { if (spread === null) {
@ -792,7 +792,6 @@ class BaseViewer {
spread = spread.cloneNode(false); spread = spread.cloneNode(false);
viewer.appendChild(spread); viewer.appendChild(spread);
} }
const pageView = this._pages[i];
spread.appendChild(pageView.div); spread.appendChild(pageView.div);
state.pages.push(pageView); state.pages.push(pageView);
@ -816,7 +815,7 @@ class BaseViewer {
// Ensure that `this._currentPageNumber` is correct. // Ensure that `this._currentPageNumber` is correct.
this._setCurrentPageNumber(pageNumber); this._setCurrentPageNumber(pageNumber);
} }
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.
this.update(); this.update();
@ -1677,7 +1676,7 @@ class BaseViewer {
} }
if (scrollMode === ScrollMode.PAGE) { if (scrollMode === ScrollMode.PAGE) {
this._ensurePageViewVisible(); this.#ensurePageViewVisible();
} else if (this._previousScrollMode === ScrollMode.PAGE) { } else if (this._previousScrollMode === ScrollMode.PAGE) {
// Ensure that the current spreadMode is still applied correctly when // Ensure that the current spreadMode is still applied correctly when
// the *previous* scrollMode was `ScrollMode.PAGE`. // the *previous* scrollMode was `ScrollMode.PAGE`.
@ -1726,7 +1725,7 @@ class BaseViewer {
pages = this._pages; pages = this._pages;
if (this._scrollMode === ScrollMode.PAGE) { if (this._scrollMode === ScrollMode.PAGE) {
this._ensurePageViewVisible(); this.#ensurePageViewVisible();
} else { } else {
// Temporarily remove all the pages from the DOM. // Temporarily remove all the pages from the DOM.
viewer.textContent = ""; viewer.textContent = "";