Merge pull request #14221 from Snuffleupagus/pr-12870-followup

Use `BaseViewer.previousPage` more in the default viewer (PR 12870 follow-up)
This commit is contained in:
Tim van der Meij 2021-11-03 19:44:12 +01:00 committed by GitHub
commit c68dc03be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2413,28 +2413,29 @@ function webViewerSidebarViewChanged(evt) {
PDFViewerApplication.pdfRenderingQueue.isThumbnailViewEnabled = PDFViewerApplication.pdfRenderingQueue.isThumbnailViewEnabled =
PDFViewerApplication.pdfSidebar.isThumbnailViewVisible; PDFViewerApplication.pdfSidebar.isThumbnailViewVisible;
const store = PDFViewerApplication.store; if (PDFViewerApplication.isInitialViewSet) {
if (store && PDFViewerApplication.isInitialViewSet) {
// Only update the storage when the document has been loaded *and* rendered. // Only update the storage when the document has been loaded *and* rendered.
store.set("sidebarView", evt.view).catch(function () {}); PDFViewerApplication.store?.set("sidebarView", evt.view).catch(() => {
// Unable to write to storage.
});
} }
} }
function webViewerUpdateViewarea(evt) { function webViewerUpdateViewarea(evt) {
const location = evt.location, const location = evt.location;
store = PDFViewerApplication.store;
if (store && PDFViewerApplication.isInitialViewSet) { if (PDFViewerApplication.isInitialViewSet) {
store // Only update the storage when the document has been loaded *and* rendered.
.setMultiple({ PDFViewerApplication.store
?.setMultiple({
page: location.pageNumber, page: location.pageNumber,
zoom: location.scale, zoom: location.scale,
scrollLeft: location.left, scrollLeft: location.left,
scrollTop: location.top, scrollTop: location.top,
rotation: location.rotation, rotation: location.rotation,
}) })
.catch(function () { .catch(() => {
/* unable to write to storage */ // Unable to write to storage.
}); });
} }
const href = PDFViewerApplication.pdfLinkService.getAnchorUrl( const href = PDFViewerApplication.pdfLinkService.getAnchorUrl(
@ -2453,18 +2454,20 @@ function webViewerUpdateViewarea(evt) {
} }
function webViewerScrollModeChanged(evt) { function webViewerScrollModeChanged(evt) {
const store = PDFViewerApplication.store; if (PDFViewerApplication.isInitialViewSet) {
if (store && PDFViewerApplication.isInitialViewSet) {
// Only update the storage when the document has been loaded *and* rendered. // Only update the storage when the document has been loaded *and* rendered.
store.set("scrollMode", evt.mode).catch(function () {}); PDFViewerApplication.store?.set("scrollMode", evt.mode).catch(() => {
// Unable to write to storage.
});
} }
} }
function webViewerSpreadModeChanged(evt) { function webViewerSpreadModeChanged(evt) {
const store = PDFViewerApplication.store; if (PDFViewerApplication.isInitialViewSet) {
if (store && PDFViewerApplication.isInitialViewSet) {
// Only update the storage when the document has been loaded *and* rendered. // Only update the storage when the document has been loaded *and* rendered.
store.set("spreadMode", evt.mode).catch(function () {}); PDFViewerApplication.store?.set("spreadMode", evt.mode).catch(() => {
// Unable to write to storage.
});
} }
} }
@ -3057,9 +3060,8 @@ function webViewerKeyDown(evt) {
) { ) {
break; break;
} }
if (PDFViewerApplication.page > 1) { pdfViewer.previousPage();
PDFViewerApplication.page--;
}
handled = true; handled = true;
break; break;