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

Merge pull request #5680 from Rob--W/forget-showPreviousViewOnLoad

Browse Source 
Reset state upon load if showPreviousViewOnLoad
This commit is contained in:
Jonas Jenwald 2015-03-02 21:49:34 +01:00
commit 43e6de7e38
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/viewer.js
View File

@ -110,6 +110,7 @@ var PDFViewerApplication = {
mouseScrollDelta: 0, mouseScrollDelta: 0,
preferenceSidebarViewOnLoad: SidebarView.NONE, preferenceSidebarViewOnLoad: SidebarView.NONE,
preferencePdfBugEnabled: false, preferencePdfBugEnabled: false,
preferenceShowPreviousViewOnLoad: true,
isViewerEmbedded: (window.parent !== window), isViewerEmbedded: (window.parent !== window),
url: '', url: '',
@ -228,6 +229,12 @@ var PDFViewerApplication = {
Preferences.get('pdfBugEnabled').then(function resolved(value) { Preferences.get('pdfBugEnabled').then(function resolved(value) {
self.preferencePdfBugEnabled = value; self.preferencePdfBugEnabled = value;
}), }),
Preferences.get('showPreviousViewOnLoad').then(function resolved(value) {
self.preferenceShowPreviousViewOnLoad = value;
if (!value && window.history.state) {
window.history.replaceState(null, '');
}
}),
Preferences.get('disableTextLayer').then(function resolved(value) { Preferences.get('disableTextLayer').then(function resolved(value) {
if (PDFJS.disableTextLayer === true) { if (PDFJS.disableTextLayer === true) {
return; return;
@ -252,6 +259,7 @@ var PDFViewerApplication = {
Preferences.get('useOnlyCssZoom').then(function resolved(value) { Preferences.get('useOnlyCssZoom').then(function resolved(value) {
PDFJS.useOnlyCssZoom = value; PDFJS.useOnlyCssZoom = value;
}) })
// TODO move more preferences and other async stuff here // TODO move more preferences and other async stuff here
]).catch(function (reason) { }); ]).catch(function (reason) { });
@ -871,11 +879,6 @@ var PDFViewerApplication = {
}); });
// Fetch the necessary preference values. // Fetch the necessary preference values.
var showPreviousViewOnLoad;
var showPreviousViewOnLoadPromise =
Preferences.get('showPreviousViewOnLoad').then(function (prefValue) {
showPreviousViewOnLoad = prefValue;
});
var defaultZoomValue; var defaultZoomValue;
var defaultZoomValuePromise = var defaultZoomValuePromise =
Preferences.get('defaultZoomValue').then(function (prefValue) { Preferences.get('defaultZoomValue').then(function (prefValue) {
@ -883,10 +886,11 @@ var PDFViewerApplication = {
}); });
var storePromise = store.initializedPromise; var storePromise = store.initializedPromise;
Promise.all([firstPagePromise, storePromise, showPreviousViewOnLoadPromise, Promise.all([firstPagePromise, storePromise, defaultZoomValuePromise]).then(
defaultZoomValuePromise]).then(function resolved() { function resolved() {
var storedHash = null; var storedHash = null;
if (showPreviousViewOnLoad && store.get('exists', false)) { if (PDFViewerApplication.preferenceShowPreviousViewOnLoad &&
store.get('exists', false)) {
var pageNum = store.get('page', '1'); var pageNum = store.get('page', '1');
var zoom = defaultZoomValue || var zoom = defaultZoomValue ||
store.get('zoom', self.pdfViewer.currentScale); store.get('zoom', self.pdfViewer.currentScale);