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

Merge pull request #14794 from Snuffleupagus/BaseViewer-update-isInPresentationMode

Browse Source 
Remove the PresentationMode special-case from `BaseViewer.update`
This commit is contained in:
Tim van der Meij 2022-04-20 19:46:53 +02:00 committed by GitHub
commit 5e8b2e5d25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
web/base_viewer.js
View File

@ -354,7 +354,7 @@ class BaseViewer {
_setCurrentPageNumber(val, resetCurrentPageView = false) { _setCurrentPageNumber(val, resetCurrentPageView = false) {
if (this._currentPageNumber === val) { if (this._currentPageNumber === val) {
if (resetCurrentPageView) { if (resetCurrentPageView) {
this._resetCurrentPageView(); this.#resetCurrentPageView();
} }
return true; return true;
} }
@ -373,7 +373,7 @@ class BaseViewer {
}); });
if (resetCurrentPageView) { if (resetCurrentPageView) {
this._resetCurrentPageView(); this.#resetCurrentPageView();
} }
return true; return true;
} }
@ -946,12 +946,11 @@ class BaseViewer {
this.update(); this.update();
} }
_scrollIntoView({ pageDiv, pageSpot = null, pageNumber = null }) { _scrollIntoView({ pageDiv, pageNumber, pageSpot = null }) {
if (this._scrollMode === ScrollMode.PAGE) { if (this._scrollMode === ScrollMode.PAGE) {
if (pageNumber) { // 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.
@ -1122,16 +1121,17 @@ class BaseViewer {
/** /**
* Refreshes page view: scrolls to the current page and updates the scale. * Refreshes page view: scrolls to the current page and updates the scale.
* @private
*/ */
_resetCurrentPageView() { #resetCurrentPageView() {
const pageNumber = this._currentPageNumber;
if (this.isInPresentationMode) { if (this.isInPresentationMode) {
// Fixes the case when PDF has different page sizes. // Fixes the case when PDF has different page sizes.
this._setScale(this._currentScaleValue, true); this._setScale(this._currentScaleValue, true);
} }
const pageView = this._pages[this._currentPageNumber - 1]; const pageView = this._pages[pageNumber - 1];
this._scrollIntoView({ pageDiv: pageView.div }); this._scrollIntoView({ pageDiv: pageView.div, pageNumber });
} }
/** /**
@ -1349,28 +1349,25 @@ class BaseViewer {
this.renderingQueue.renderHighestPriority(visible); this.renderingQueue.renderHighestPriority(visible);
if (!this.isInPresentationMode) { const isSimpleLayout =
const isSimpleLayout = this._spreadMode === SpreadMode.NONE &&
this._spreadMode === SpreadMode.NONE && (this._scrollMode === ScrollMode.PAGE ||
(this._scrollMode === ScrollMode.PAGE || this._scrollMode === ScrollMode.VERTICAL);
this._scrollMode === ScrollMode.VERTICAL); const currentId = this._currentPageNumber;
let currentId = this._currentPageNumber; let stillFullyVisible = false;
let stillFullyVisible = false;
for (const page of visiblePages) { for (const page of visiblePages) {
if (page.percent < 100) { if (page.percent < 100) {
break; break;
}
if (page.id === currentId && isSimpleLayout) {
stillFullyVisible = true;
break;
}
} }
if (!stillFullyVisible) { if (page.id === currentId && isSimpleLayout) {
currentId = visiblePages[0].id; stillFullyVisible = true;
break;
} }
this._setCurrentPageNumber(currentId);
} }
this._setCurrentPageNumber(
stillFullyVisible ? currentId : visiblePages[0].id
);
this._updateLocation(visible.first); this._updateLocation(visible.first);
this.eventBus.dispatch("updateviewarea", { this.eventBus.dispatch("updateviewarea", {