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

Merge pull request #11725 from Snuffleupagus/app-ViewHistory-init

Browse Source 
Re-factor `PDFViewerApplication.load` such that `{PDFViewer, PDFThumbnailViewer}.setDocument` happens slightly earlier
This commit is contained in:
Tim van der Meij 2020-03-22 17:15:44 +01:00 committed by GitHub
commit b86df97725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 100 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
web/app.js
View File

@ -1040,8 +1040,6 @@ const PDFViewerApplication = {
this.toolbar.setPagesCount(pdfDocument.numPages, false);
this.secondaryToolbar.setPagesCount(pdfDocument.numPages);
const store = (this.store = new ViewHistory(pdfDocument.fingerprint));
let baseDocumentUrl;
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
baseDocumentUrl = null;
@ -1060,10 +1058,9 @@ const PDFViewerApplication = {
const pdfThumbnailViewer = this.pdfThumbnailViewer;
pdfThumbnailViewer.setDocument(pdfDocument);
firstPagePromise.then(pdfPage => {
this.loadingBar.setWidth(this.appConfig.viewerContainer);
const storePromise = store
const storedPromise = (this.store = new ViewHistory(
pdfDocument.fingerprint
))
.getMultiple({
page: null,
zoom: DEFAULT_SCALE_VALUE,
@ -1076,23 +1073,20 @@ const PDFViewerApplication = {
})
.catch(() => {
/* Unable to read from storage; ignoring errors. */
return Object.create(null);
});
firstPagePromise.then(pdfPage => {
this.loadingBar.setWidth(this.appConfig.viewerContainer);
Promise.all([
animationStarted,
storePromise,
storedPromise,
pageLayoutPromise,
pageModePromise,
openActionPromise,
])
.then(
async ([
timeStamp,
values = {},
pageLayout,
pageMode,
openAction,
]) => {
.then(async ([timeStamp, stored, pageLayout, pageMode, openAction]) => {
const viewOnLoad = AppOptions.get("viewOnLoad");
this._initializePdfHistory({
@ -1111,22 +1105,21 @@ const PDFViewerApplication = {
let scrollMode = AppOptions.get("scrollModeOnLoad");
let spreadMode = AppOptions.get("spreadModeOnLoad");
if (values.page && viewOnLoad !== ViewOnLoad.INITIAL) {
if (stored.page && viewOnLoad !== ViewOnLoad.INITIAL) {
hash =
`page=${values.page}&zoom=${zoom || values.zoom},` +
`${values.scrollLeft},${values.scrollTop}`;
`page=${stored.page}&zoom=${zoom || stored.zoom},` +
`${stored.scrollLeft},${stored.scrollTop}`;
rotation = parseInt(values.rotation, 10);
// Always let user preferences take precedence over the view
// history.
rotation = parseInt(stored.rotation, 10);
// Always let user preference take precedence over the view history.
if (sidebarView === SidebarView.UNKNOWN) {
sidebarView = values.sidebarView | 0;
sidebarView = stored.sidebarView | 0;
}
if (scrollMode === ScrollMode.UNKNOWN) {
scrollMode = values.scrollMode | 0;
scrollMode = stored.scrollMode | 0;
}
if (spreadMode === SpreadMode.UNKNOWN) {
spreadMode = values.spreadMode | 0;
spreadMode = stored.spreadMode | 0;
}
}
// Always let the user preference/view history take precedence.
@ -1151,12 +1144,10 @@ const PDFViewerApplication = {
}
// For documents with different page sizes, once all pages are
// resolved, ensure that the correct location becomes visible on
// load.
// resolved, ensure that the correct location becomes visible on load.
// (To reduce the risk, in very large and/or slow loading documents,
// that the location changes *after* the user has started
// interacting with the viewer, wait for either `pagesPromise` or
// a timeout.)
// that the location changes *after* the user has started interacting
// with the viewer, wait for either `pagesPromise` or a timeout.)
await Promise.race([
pagesPromise,
new Promise(resolve => {
@ -1175,8 +1166,7 @@ const PDFViewerApplication = {
pdfViewer.currentScaleValue = pdfViewer.currentScaleValue;
// Re-apply the initial document location.
this.setInitialView(hash);
}
)
})
.catch(() => {
// Ensure that the document is always completely initialized,
// even if there are any errors thrown above.

9
web/view_history.js
View File

@ -31,21 +31,22 @@ class ViewHistory {
this._initializedPromise = this._readFromStorage().then(databaseStr => {
const database = JSON.parse(databaseStr || "{}");
if (!("files" in database)) {
let index = -1;
if (!Array.isArray(database.files)) {
database.files = [];
} else {
while (database.files.length >= this.cacheSize) {
database.files.shift();
}
}
let index = -1;
for (let i = 0, length = database.files.length; i < length; i++) {
for (let i = 0, ii = database.files.length; i < ii; i++) {
const branch = database.files[i];
if (branch.fingerprint === this.fingerprint) {
index = i;
break;
}
}
}
if (index === -1) {
index = database.files.push({ fingerprint: this.fingerprint }) - 1;
}