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

Merge pull request #1021 from notmasteryet/tree-52

Browse Source 
Fix blank unopened-before-document regression
This commit is contained in:
Julian Viereck 2012-01-04 00:28:16 -08:00
commit 5348dd9028
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/viewer.js
View File

@ -444,7 +444,7 @@ var PDFView = {
else if (storedHash) else if (storedHash)
this.setHash(storedHash); this.setHash(storedHash);
else { else {
this.setScale(scale || kDefaultScale, true); this.parseScale(scale || kDefaultScale, true);
this.page = 1; this.page = 1;
} }
}, },
@ -934,7 +934,7 @@ window.addEventListener('load', function webViewerLoad(evt) {
params[unescape(param[0])] = unescape(param[1]); params[unescape(param[0])] = unescape(param[1]);
} }
var scale = ('scale' in params) ? params.scale : kDefaultScale; var scale = ('scale' in params) ? params.scale : 0;
PDFView.open(params.file || kDefaultURL, parseFloat(scale)); PDFView.open(params.file || kDefaultURL, parseFloat(scale));
if (!window.File || !window.FileReader || !window.FileList || !window.Blob) if (!window.File || !window.FileReader || !window.FileList || !window.Blob)
@ -1081,7 +1081,8 @@ window.addEventListener('scalechange', function scalechange(evt) {
if (!evt.resetAutoSettings && if (!evt.resetAutoSettings &&
(document.getElementById('pageWidthOption').selected || (document.getElementById('pageWidthOption').selected ||
document.getElementById('pageFitOption').selected)) { document.getElementById('pageFitOption').selected ||
document.getElementById('pageAutoOption').selected)) {
updateViewarea(); updateViewarea();
return; return;
} }