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

Merge pull request #3971 from brendandahl/rotation2

Browse Source 
Fix rotation regression from #3970.
This commit is contained in:
Yury Delendik 2013-11-25 14:35:23 -08:00
commit 49082cf93e
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/page_view.js
View File

@ -28,7 +28,7 @@ var PageView = function pageView(container, id, scale,
this.rotation = 0; this.rotation = 0;
this.scale = scale || 1.0; this.scale = scale || 1.0;
this.viewport = defaultViewport; this.viewport = defaultViewport;
this.pdfPageRotate = defaultViewport.rotate; this.pdfPageRotate = defaultViewport.rotation;
this.renderingState = RenderingStates.INITIAL; this.renderingState = RenderingStates.INITIAL;
this.resume = null; this.resume = null;
@ -54,19 +54,12 @@ var PageView = function pageView(container, id, scale,
this.setPdfPage = function pageViewSetPdfPage(pdfPage) { this.setPdfPage = function pageViewSetPdfPage(pdfPage) {
this.pdfPage = pdfPage; this.pdfPage = pdfPage;
this.pdfPageRotate = pdfPage.rotate; this.pdfPageRotate = pdfPage.rotate;
this.updateViewport(); var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
this.viewport = pdfPage.getViewport(this.scale * CSS_UNITS, totalRotation);
this.stats = pdfPage.stats; this.stats = pdfPage.stats;
this.reset(); this.reset();
}; };
this.updateViewport = function pageViewUpdateViewport() {
var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
this.viewport = this.viewport.clone({
scale: this.scale * CSS_UNITS,
rotation: totalRotation
});
},
this.destroy = function pageViewDestroy() { this.destroy = function pageViewDestroy() {
this.zoomLayer = null; this.zoomLayer = null;
this.reset(); this.reset();
@ -111,7 +104,11 @@ var PageView = function pageView(container, id, scale,
this.rotation = rotation; this.rotation = rotation;
} }
this.updateViewport(); var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
this.viewport = this.viewport.clone({
scale: this.scale * CSS_UNITS,
rotation: totalRotation
});
if (USE_ONLY_CSS_ZOOM && this.canvas) { if (USE_ONLY_CSS_ZOOM && this.canvas) {
this.cssTransform(this.canvas); this.cssTransform(this.canvas);