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

Merge pull request #3864 from Snuffleupagus/independent-zoom-parameter

Browse Source 
Make 'zoom' independent from 'page' in the hash parameters
This commit is contained in:
Yury Delendik 2013-11-12 11:07:15 -08:00
commit a6e7f2226a
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/viewer.js
View File

@ -1130,8 +1130,10 @@ var PDFView = {
PDFView.navigateTo(params.nameddest); PDFView.navigateTo(params.nameddest);
return; return;
} }
var pageNumber, dest;
if ('page' in params) { if ('page' in params) {
var pageNumber = (params.page | 0) || 1; pageNumber = (params.page | 0) || 1;
}
if ('zoom' in params) { if ('zoom' in params) {
var zoomArgs = params.zoom.split(','); // scale,left,top var zoomArgs = params.zoom.split(','); // scale,left,top
// building destination array // building destination array
@ -1140,18 +1142,19 @@ var PDFView = {
// it should stay as it is. // it should stay as it is.
var zoomArg = zoomArgs[0]; var zoomArg = zoomArgs[0];
var zoomArgNumber = parseFloat(zoomArg); var zoomArgNumber = parseFloat(zoomArg);
if (zoomArgNumber) if (zoomArgNumber) {
zoomArg = zoomArgNumber / 100; zoomArg = zoomArgNumber / 100;
}
var dest = [null, {name: 'XYZ'}, dest = [null, {name: 'XYZ'},
zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null, zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null,
zoomArgs.length > 2 ? (zoomArgs[2] | 0) : null, zoomArgs.length > 2 ? (zoomArgs[2] | 0) : null,
zoomArg]; zoomArg];
var currentPage = this.pages[pageNumber - 1];
currentPage.scrollIntoView(dest);
} else {
this.page = pageNumber; // simple page
} }
if (dest) {
var currentPage = this.pages[(pageNumber || this.page) - 1];
currentPage.scrollIntoView(dest);
} else if (pageNumber) {
this.page = pageNumber; // simple page
} }
if ('pagemode' in params) { if ('pagemode' in params) {
var toggle = document.getElementById('sidebarToggle'); var toggle = document.getElementById('sidebarToggle');