Merge pull request #3910 from deathy/master

Fix destination name for 'Fit' zoom levels in hash params
This commit is contained in:
Yury Delendik 2014-06-11 13:20:57 -05:00
commit da42fce118

View File

@ -1328,6 +1328,9 @@ var PDFView = {
}, },
setHash: function pdfViewSetHash(hash) { setHash: function pdfViewSetHash(hash) {
var validFitZoomValues = ['Fit','FitB','FitH','FitBH',
'FitV','FitBV','FitR'];
if (!hash) { if (!hash) {
return; return;
} }
@ -1352,10 +1355,13 @@ 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);
var destName = 'XYZ';
if (zoomArgNumber) { if (zoomArgNumber) {
zoomArg = zoomArgNumber / 100; zoomArg = zoomArgNumber / 100;
} else if (validFitZoomValues.indexOf(zoomArg) >= 0) {
destName = zoomArg;
} }
dest = [null, {name: 'XYZ'}, dest = [null, { name: destName },
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];