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

Merge pull request #6254 from Snuffleupagus/issue-6253

Browse Source 
Prevent documents from intermittently opening with the zoom level set to 1% (issue 6253)
This commit is contained in:
Tim van der Meij 2015-07-23 14:09:56 +02:00
commit 21053460d7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/viewer.js
View File

@ -790,7 +790,7 @@ var PDFViewerApplication = {
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', DEFAULT_SCALE_VALUE);
var left = store.get('scrollLeft', '0'); var left = store.get('scrollLeft', '0');
var top = store.get('scrollTop', '0'); var top = store.get('scrollTop', '0');
@ -1639,13 +1639,16 @@ window.addEventListener('updateviewarea', function (evt) {
window.addEventListener('resize', function webViewerResize(evt) { window.addEventListener('resize', function webViewerResize(evt) {
if (PDFViewerApplication.initialized) { if (PDFViewerApplication.initialized) {
var currentScaleValue = PDFViewerApplication.pdfViewer.currentScaleValue; var currentScaleValue = PDFViewerApplication.pdfViewer.currentScaleValue;
switch (currentScaleValue) { if (currentScaleValue === 'auto' ||
case 'auto': currentScaleValue === 'page-fit' ||
case 'page-fit': currentScaleValue === 'page-width') {
case 'page-width': // Note: the scale is constant for 'page-actual'.
// Note: the scale is constant for 'page-actual'. PDFViewerApplication.pdfViewer.currentScaleValue = currentScaleValue;
PDFViewerApplication.pdfViewer.currentScaleValue = currentScaleValue; } else if (!currentScaleValue) {
break; // Normally this shouldn't happen, but if the scale wasn't initialized
// we set it to the default value in order to prevent any issues.
// (E.g. the document being rendered with the wrong scale on load.)
PDFViewerApplication.pdfViewer.currentScaleValue = DEFAULT_SCALE_VALUE;
} }
} }
updateViewarea(); updateViewarea();