Merge pull request #29 from leff/master

Enhancement: Zoom amount and ZoomTo
winkerVSbecks · May 30, 2015 · 4bc9c7c · 4bc9c7c
2 parents 3f60910 + 8ac0aab
commit 4bc9c7c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/dist/angular-pdf-viewer.min.js b/dist/angular-pdf-viewer.min.js
diff --git a/readme.md b/readme.md
@@ -54,8 +54,9 @@ pdfDelegate.$getByHandle('my-pdf-container').zoomIn();
 The following methods are available to the delegate:
 - prev
 - next
-- zoomIn
-- zoomOut
+- zoomIn(amount) *default amount = 0.2*
+- zoomOut(amount) *default amount = 0.2*
+- zoomTo(amount)
 - rotate *(clockwise by 90 degrees)*
 - getPageCount
 - getCurrentPage

diff --git a/src/js/pdf-ctrl.js b/src/js/pdf-ctrl.js
@@ -65,14 +65,24 @@ angular.module('pdf')
       renderPage(currentPage);
     };
 
-    self.zoomIn = function() {
-      scale = parseFloat(scale) + 0.2;
+    self.zoomIn = function(amount) {
+      amount = amount || 0.2;
+      scale = parseFloat(scale) + amount;
       renderPage(currentPage);
       return scale;
     };
 
-    self.zoomOut = function() {
-      scale = parseFloat(scale) - 0.2;
+    self.zoomOut = function(amount) {
+      amount = amount || 0.2;
+      scale = parseFloat(scale) - amount;
+      scale = (scale > 0) ? scale : 0.1;
+      renderPage(currentPage);
+      return scale;
+    };
+
+    self.zoomTo = function(zoomToScale) {
+      zoomToScale = (zoomToScale) ? zoomToScale : 1.0;
+      scale = parseFloat(zoomToScale);
       renderPage(currentPage);
       return scale;
     };

diff --git a/src/js/pdf-viewer-delegate.js b/src/js/pdf-viewer-delegate.js
@@ -4,6 +4,7 @@ angular.module('pdf', [])
     'next',
     'zoomIn',
     'zoomOut',
+    'zoomTo',
     'rotate',
     'getPageCount',
     'getCurrentPage',