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

Initial view bug and rename viewport function

Browse Source
This commit is contained in:
Yury Delendik 2012-04-11 10:18:29 -07:00
parent 2f4423cffb
commit d61c4f07f8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util.js
View File

@ -244,16 +244,16 @@ var PageViewport = PDFJS.PageViewport = (function PageViewportClosure() {
this.height = height; this.height = height;
} }
PageViewport.prototype = { PageViewport.prototype = {
convertPointToViewport: function PageViewport_convertPointToViewport(x, y) { convertToViewportPoint: function PageViewport_convertToViewportPoint(x, y) {
return Util.applyTransform([x, y], this.transform); return Util.applyTransform([x, y], this.transform);
}, },
convertRectangleToViewport: convertToViewportRectangle:
function PageViewport_convertRectangeToViewport(rect) { function PageViewport_convertToViewportRectangle(rect) {
var tl = Util.applyTransform([rect[0], rect[1]], this.transform); var tl = Util.applyTransform([rect[0], rect[1]], this.transform);
var br = Util.applyTransform([rect[2], rect[3]], this.transform); var br = Util.applyTransform([rect[2], rect[3]], this.transform);
return [tl[0], tl[1], br[0], br[1]]; return [tl[0], tl[1], br[0], br[1]];
}, },
convertViewportToPoint: function PageViewport_convertViewportToPoint(x, y) { convertToPdfPoint: function PageViewport_convertToPdfPoint(x, y) {
return Util.applyInverseTransform([x, y], this.transform); return Util.applyInverseTransform([x, y], this.transform);
} }
}; };

14
web/viewer.js
View File

@ -730,7 +730,7 @@ var PageView = function pageView(container, pdfPage, id, scale,
this.pdfPage = pdfPage; this.pdfPage = pdfPage;
this.scale = scale || 1.0; this.scale = scale || 1.0;
this.viewport = this.pdfPage.getViewport(scale); this.viewport = this.pdfPage.getViewport(this.scale);
var anchor = document.createElement('a'); var anchor = document.createElement('a');
anchor.name = '' + this.id; anchor.name = '' + this.id;
@ -785,7 +785,7 @@ var PageView = function pageView(container, pdfPage, id, scale,
}; };
} }
function createElementWithStyle(tagName, item) { function createElementWithStyle(tagName, item) {
var rect = viewport.convertRectangleToViewport(item.rect); var rect = viewport.convertToViewportRectangle(item.rect);
rect = Util.normalizeRect(rect); rect = Util.normalizeRect(rect);
var element = document.createElement(tagName); var element = document.createElement(tagName);
element.style.left = Math.floor(rect[0]) + 'px'; element.style.left = Math.floor(rect[0]) + 'px';
@ -861,7 +861,7 @@ var PageView = function pageView(container, pdfPage, id, scale,
this.getPagePoint = function pageViewGetPagePoint(x, y) { this.getPagePoint = function pageViewGetPagePoint(x, y) {
var scale = PDFView.currentScale; var scale = PDFView.currentScale;
return this.viewport.convertPointToViewport(x, y); return this.viewport.convertToPdfPoint(x, y);
}; };
this.scrollIntoView = function pageViewScrollIntoView(dest) { this.scrollIntoView = function pageViewScrollIntoView(dest) {
@ -909,8 +909,8 @@ var PageView = function pageView(container, pdfPage, id, scale,
} }
var boundingRect = [ var boundingRect = [
this.viewport.convertPointToViewport(x, y), this.viewport.convertToViewportPoint(x, y),
this.viewport.convertPointToViewport(x + width, y + height) this.viewport.convertToViewportPoint(x + width, y + height)
]; ];
if (scale && scale !== PDFView.currentScale) if (scale && scale !== PDFView.currentScale)
@ -1378,8 +1378,8 @@ function updateViewarea() {
store.set('exists', true); store.set('exists', true);
store.set('page', pageNumber); store.set('page', pageNumber);
store.set('zoom', normalizedScaleValue); store.set('zoom', normalizedScaleValue);
store.set('scrollLeft', Math.round(topLeft.x)); store.set('scrollLeft', Math.round(topLeft[0]));
store.set('scrollTop', Math.round(topLeft.y)); store.set('scrollTop', Math.round(topLeft[1]));
var href = PDFView.getAnchorUrl(pdfOpenParams); var href = PDFView.getAnchorUrl(pdfOpenParams);
document.getElementById('viewBookmark').href = href; document.getElementById('viewBookmark').href = href;
} }