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

Merge pull request #2872 from sgtatham/master

Browse Source 
Fix handling of [page /XYZ null null null] destinations.
This commit is contained in:
Yury Delendik 2013-03-03 15:00:54 -08:00
commit 91ab83a69a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/viewer.js
View File

@ -1523,8 +1523,10 @@ var PDFView = {
if (zoomArgNumber) if (zoomArgNumber)
zoomArg = zoomArgNumber / 100; zoomArg = zoomArgNumber / 100;
var dest = [null, {name: 'XYZ'}, (zoomArgs[1] | 0), var dest = [null, {name: 'XYZ'},
(zoomArgs[2] | 0), zoomArg]; zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null,
zoomArgs.length > 2 ? (zoomArgs[2] | 0) : null,
zoomArg];
var currentPage = this.pages[pageNumber - 1]; var currentPage = this.pages[pageNumber - 1];
currentPage.scrollIntoView(dest); currentPage.scrollIntoView(dest);
} else { } else {
@ -2036,6 +2038,12 @@ var PageView = function pageView(container, pdfPage, id, scale,
x = dest[2]; x = dest[2];
y = dest[3]; y = dest[3];
scale = dest[4]; scale = dest[4];
// If x and/or y coordinates are not supplied, default to
// _top_ left of the page (not the obvious bottom left,
// since aligning the bottom of the intended page with the
// top of the window is rarely helpful).
x = x !== null ? x : 0;
y = y !== null ? y : this.height / this.scale;
break; break;
case 'Fit': case 'Fit':
case 'FitB': case 'FitB':