Initial view bug and rename viewport function

diff --git a/src/util.js b/src/util.js
index 9989d9c74685e9e65ef72ed55614eb91aed81ba9..390b0842799fb794452d77b7576706b61a72317c 100644 (file)
--- a/src/util.js
+++ b/src/util.js
@@ -244,16 +244,16 @@ var PageViewport = PDFJS.PageViewport = (function PageViewportClosure() {
     this.height = height;
   }
   PageViewport.prototype = {
-    convertPointToViewport: function PageViewport_convertPointToViewport(x, y) {
+    convertToViewportPoint: function PageViewport_convertToViewportPoint(x, y) {
       return Util.applyTransform([x, y], this.transform);
     },
-    convertRectangleToViewport:
-      function PageViewport_convertRectangeToViewport(rect) {
+    convertToViewportRectangle:
+      function PageViewport_convertToViewportRectangle(rect) {
       var tl = Util.applyTransform([rect[0], rect[1]], this.transform);
       var br = Util.applyTransform([rect[2], rect[3]], this.transform);
       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);
     }
   };

diff --git a/web/viewer.js b/web/viewer.js
index 3c7279fb4895a56878c7664593bd393f17d57684..51d4df7114805d9549b2ec5488c5896101da09c5 100644 (file)
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -730,7 +730,7 @@ var PageView = function pageView(container, pdfPage, id, scale,
   this.pdfPage = pdfPage;
 
   this.scale = scale || 1.0;
-  this.viewport = this.pdfPage.getViewport(scale);
+  this.viewport = this.pdfPage.getViewport(this.scale);
 
   var anchor = document.createElement('a');
   anchor.name = '' + this.id;
@@ -785,7 +785,7 @@ var PageView = function pageView(container, pdfPage, id, scale,
       };
     }
     function createElementWithStyle(tagName, item) {
-      var rect = viewport.convertRectangleToViewport(item.rect);
+      var rect = viewport.convertToViewportRectangle(item.rect);
       rect = Util.normalizeRect(rect);
       var element = document.createElement(tagName);
       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) {
     var scale = PDFView.currentScale;
-    return this.viewport.convertPointToViewport(x, y);
+    return this.viewport.convertToPdfPoint(x, y);
   };
 
   this.scrollIntoView = function pageViewScrollIntoView(dest) {
@@ -909,8 +909,8 @@ var PageView = function pageView(container, pdfPage, id, scale,
       }
 
       var boundingRect = [
-        this.viewport.convertPointToViewport(x, y),
-        this.viewport.convertPointToViewport(x + width, y + height)
+        this.viewport.convertToViewportPoint(x, y),
+        this.viewport.convertToViewportPoint(x + width, y + height)
       ];
 
       if (scale && scale !== PDFView.currentScale)
@@ -1378,8 +1378,8 @@ function updateViewarea() {
   store.set('exists', true);
   store.set('page', pageNumber);
   store.set('zoom', normalizedScaleValue);
-  store.set('scrollLeft', Math.round(topLeft.x));
-  store.set('scrollTop', Math.round(topLeft.y));
+  store.set('scrollLeft', Math.round(topLeft[0]));
+  store.set('scrollTop', Math.round(topLeft[1]));
   var href = PDFView.getAnchorUrl(pdfOpenParams);
   document.getElementById('viewBookmark').href = href;
 }