yetangitu/pdf.js
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7440 from Snuffleupagus/bug-874482

Browse source 
Prevent destinations with bad left/top values from scrolling the wrong page into view (bug 874482)
This commit is contained in:
Tim van der Meij 2016-08-28 15:47:40 +02:00 • committed by GitHub
commit b0a0bef267
4 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

52
web/pdf_viewer.js
View file

@ -458,7 +458,11 @@ var PDFViewer = (function pdfViewer() {
dest = [null, { name: 'XYZ' }, this._location.left,
this._location.top, null];
}
this.scrollPageIntoView(page, dest);
this.scrollPageIntoView({
pageNumber: page,
destArray: dest,
allowNegativeOffset: true,
});
}
this._setScaleDispatchEvent(newScale, newValue, preset);
@ -531,16 +535,38 @@ var PDFViewer = (function pdfViewer() {
},
/**
* Scrolls page into view.
* @param {number} pageNumber
* @param {Array} dest - (optional) original PDF destination array:
* <page-ref> </XYZ|FitXXX> <args..>
* @typedef ScrollPageIntoViewParameters
* @param {number} pageNumber - The page number.
* @param {Array} destArray - (optional) The original PDF destination array,
* in the format: <page-ref> </XYZ|/FitXXX> <args..>
* @param {boolean} allowNegativeOffset - (optional) Allow negative page
* offsets. The default value is `false`.
*/
scrollPageIntoView: function PDFViewer_scrollPageIntoView(pageNumber,
dest) {
/**
* Scrolls page into view.
* @param {ScrollPageIntoViewParameters} params
*/
scrollPageIntoView: function PDFViewer_scrollPageIntoView(params) {
if (!this.pdfDocument) {
return;
}
//#if GENERIC
if (arguments.length > 1 || typeof params === 'number') {
console.warn('Call of scrollPageIntoView() with obsolete signature.');
var paramObj = {};
if (typeof params === 'number') {
paramObj.pageNumber = params; // pageNumber argument was found.
}
if (arguments[1] instanceof Array) {
paramObj.destArray = arguments[1]; // destArray argument was found.
}
params = paramObj;
}
//#endif
var pageNumber = params.pageNumber || 0;
var dest = params.destArray || null;
var allowNegativeOffset = params.allowNegativeOffset || false;
if (this.isInPresentationMode || !dest) {
this._setCurrentPageNumber(pageNumber, /* resetCurrentPageView */ true);
@ -548,6 +574,11 @@ var PDFViewer = (function pdfViewer() {
}
var pageView = this._pages[pageNumber - 1];
if (!pageView) {
console.error('PDFViewer_scrollPageIntoView: ' +
'Invalid "pageNumber" parameter.');
return;
}
var x = 0, y = 0;
var width = 0, height = 0, widthScale, heightScale;
var changeOrientation = (pageView.rotation % 180 === 0 ? false : true);
@ -628,6 +659,13 @@ var PDFViewer = (function pdfViewer() {
var left = Math.min(boundingRect[0][0], boundingRect[1][0]);
var top = Math.min(boundingRect[0][1], boundingRect[1][1]);
if (!allowNegativeOffset) {
// Some bad PDF generators will create destinations with e.g. top values
// that exceeds the page height. Ensure that offsets are not negative,
// to prevent a previous page from becoming visible (fixes bug 874482).
left = Math.max(left, 0);
top = Math.max(top, 0);
}
scrollIntoView(pageView.div, { left: left, top: top });
},