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

Small refactoring of the code that calls |PDFViewerApplication.setInitialView|

Browse Source 
This is a minor cleanup, to avoid an unnecessary `Promise.all` and to simplify catching |ViewHistory| errors.
This commit is contained in:
Jonas Jenwald 2015-03-31 18:17:56 +02:00
parent 6091e7bd6b
commit e5c4819601
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
web/viewer.js
View File

@ -886,38 +886,34 @@ var PDFViewerApplication = {
} }
PDFHistory.initialize(self.documentFingerprint, self); PDFHistory.initialize(self.documentFingerprint, self);
} }
});
var storePromise = store.initializedPromise; store.initializedPromise.then(function resolved() {
Promise.all([firstPagePromise, storePromise]).then(function resolved() { var storedHash = null;
var storedHash = null; if (self.preferenceShowPreviousViewOnLoad &&
if (self.preferenceShowPreviousViewOnLoad && store.get('exists', false)) {
store.get('exists', false)) { var pageNum = store.get('page', '1');
var pageNum = store.get('page', '1'); var zoom = self.preferenceDefaultZoomValue ||
var zoom = self.preferenceDefaultZoomValue || store.get('zoom', self.pdfViewer.currentScale);
store.get('zoom', self.pdfViewer.currentScale); var left = store.get('scrollLeft', '0');
var left = store.get('scrollLeft', '0'); var top = store.get('scrollTop', '0');
var top = store.get('scrollTop', '0');
storedHash = 'page=' + pageNum + '&zoom=' + zoom + ',' + storedHash = 'page=' + pageNum + '&zoom=' + zoom + ',' +
left + ',' + top; left + ',' + top;
} else if (self.preferenceDefaultZoomValue) { } else if (self.preferenceDefaultZoomValue) {
storedHash = 'page=1&zoom=' + self.preferenceDefaultZoomValue; storedHash = 'page=1&zoom=' + self.preferenceDefaultZoomValue;
} }
self.setInitialView(storedHash, scale); self.setInitialView(storedHash, scale);
// Make all navigation keys work on document load, // Make all navigation keys work on document load,
// unless the viewer is embedded in a web page. // unless the viewer is embedded in a web page.
if (!self.isViewerEmbedded) { if (!self.isViewerEmbedded) {
self.pdfViewer.focus(); self.pdfViewer.focus();
//#if (FIREFOX || MOZCENTRAL) //#if (FIREFOX || MOZCENTRAL)
// self.pdfViewer.blur(); // self.pdfViewer.blur();
//#endif //#endif
} }
}, function rejected(reason) { }, function rejected(reason) {
console.error(reason); console.error(reason);
firstPagePromise.then(function () {
self.setInitialView(null, scale); self.setInitialView(null, scale);
}); });
}); });