From a9e3db54c55e01977e895222c686c4e2ac4bf4ed Mon Sep 17 00:00:00 2001
From: Wayne Mogg <wayne.mogg@gmail.com>
Date: Sat, 31 Dec 2016 11:05:00 +1000
Subject: [PATCH] Add zoomMax option

---
 README.md                 | 11 ++++++++++
 demo.html                 |  3 ++-
 dist/imgViewer.js         | 36 +++++++++++++++++++--------------
 dist/imgViewer.min.js     |  4 ++--
 imgViewer.jquery.json     |  2 +-
 package.json              |  2 +-
 src/imgViewer.js          | 42 ++++++++++-----------------------------
 test/imgViewer_options.js | 19 ++++++++++++++++--
 8 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 145e991..aa4b4d4 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,14 @@ $("#image1").imgViewer("option", "zoomStep", 0.05);
 ```javascript
 $("#image1").imgViewer("option", "zoom", 3);
 ```
+###zoomMax
+  * Get/Set the limit on the maximum zoom level of the image - values less than 1 have no affect
+  * Default: 0 (ie no limit on zoom)
+  * Example - to restrict zoom to 3x or less:
+
+```javascript
+$("#image1").imgViewer("option", "zoomMax", 3);
+```
 ###zoomable
   * Controls if image will be zoomable
   * Default: true
@@ -189,6 +197,9 @@ This plugin is provided under the [MIT License](http://opensource.org/licenses/M
 Copyright (c) 2013 Wayne Mogg.
 
 ## Release History
+### 0.9.1
+- Add zoomMax option to limit maximum possible zoom level
+
 ### 0.9.0
 - Replace jquery.event.ue with hammer.js and jquery.hammer.js for more flexibility with touch gesture support
 - Add dragable option allowing user to disable dragging 
diff --git a/demo.html b/demo.html
index ebc4eb0..c0b9975 100644
--- a/demo.html
+++ b/demo.html
@@ -33,9 +33,10 @@ <h2>Centred in a div - Dynamic Width</h2>
 <script type="text/javascript">
 ;(function($) {
 		$("#image1").imgViewer({
+			zoomMax: 4,
 			onClick: function( e, self ) {
 				var pos = self.cursorToImg( e.pageX, e.pageY);
-				$("#position").html(e.pageX + " " + e.pageY + " " + pos.x + " " + pos.y);
+				$("#position").html(e.pageX + " " + e.pageY + " " + pos.x + " " + pos.y + "  zoom: " + self.options.zoom);
 			}
 		});
 		function test(e, self) {
diff --git a/dist/imgViewer.js b/dist/imgViewer.js
index 8906f9b..50761b2 100644
--- a/dist/imgViewer.js
+++ b/dist/imgViewer.js
@@ -1,4 +1,4 @@
-/*! jQuery imgViewer - v0.9.0 - 2016-08-07
+/*! jQuery imgViewer - v0.9.1 - 2016-12-31
 * https://github.com/waynegm/imgViewer
 * Copyright (c) 2016 Wayne Mogg; Licensed MIT */
 /*
@@ -9,6 +9,7 @@
 		options: {
 			zoomStep: 0.1,
 			zoom: 1,
+			zoomMax: 0,
 			zoomable: true,
 			dragable: true,
 			onClick: null,
@@ -35,7 +36,7 @@
 //		the pixel coordinate of the original image at the center of the viewport
 			self.vCenter = {};
 //		a flag used to decide if a mouse click is part of a drag or a proper click
-			self.dragging = false;
+			self.drag = false;
 			self.pinch = false;
 //		a flag used to check the target image has loaded
 			self.ready = false;
@@ -211,27 +212,23 @@
 					self.update();
 				}
 			}
-
-			$zimg.on( "panstart" , function(ev) {
+			$zimg.on("pan", function(ev) {
 				ev.preventDefault();
-				if (!self.pinch) {
+				if (!self.drag) {
+					self.drag = true;
 					self.dragXorg = self.vCenter.x;
 					self.dragYorg = self.vCenter.y;
 					startRenderLoop();
-				}
-			});
-
-			$zimg.on( "panmove", function(ev) {
-				ev.preventDefault();
-				if (!self.pinch) {
+				} else {
 					self.vCenter.x = self.dragXorg - ev.gesture.deltaX/self.options.zoom;
 					self.vCenter.y = self.dragYorg - ev.gesture.deltaY/self.options.zoom;
 				}
 			});
-				
+
 			$zimg.on( "panend", function(ev) {
 				ev.preventDefault();
-				if (!self.pinch) {
+				if (self.drag) {
+					self.drag = false;
 					stopRenderLoop();
 					self.update();
 				}
@@ -253,8 +250,7 @@
 		_unbind_drag_events: function() {
 			var self = this;
 			var $zimg = $(self.zimg);
-			$zimg.off("panstart");
-			$zimg.off("panmove");
+			$zimg.off("pan");
 			$zimg.off("panend");
 		},	
 
@@ -282,6 +278,11 @@
 						return;
 					}
 					break;
+				case 'zoomMax':
+					if (parseFloat(value) < 0 || isNaN(parseFloat(value))) {
+						return;
+					}
+					break;
 			}
 			var version = $.ui.version.split('.');
 			if (version[0] > 1 || version[1] > 8) {
@@ -449,9 +450,14 @@
 					height = $img.height(),
 					offset = $img.offset(),
 					zoom = this.options.zoom,
+					zoomMax = this.options.zoomMax,
 					half_width = width/2,
 					half_height = height/2;
   
+				if (zoomMax !==0) {
+						zoom = Math.min(zoom, zoomMax);
+						this.options.zoom = zoom;
+				}
 				if (zoom <= 1) {
 					zTop = 0;
 					zLeft = 0;
diff --git a/dist/imgViewer.min.js b/dist/imgViewer.min.js
index b062db7..44baef2 100644
--- a/dist/imgViewer.min.js
+++ b/dist/imgViewer.min.js
@@ -1,4 +1,4 @@
-/*! jQuery imgViewer - v0.9.0 - 2016-08-07
+/*! jQuery imgViewer - v0.9.1 - 2016-12-31
 * https://github.com/waynegm/imgViewer
 * Copyright (c) 2016 Wayne Mogg; Licensed MIT */
-!function(a){a.widget("wgm.imgViewer",{options:{zoomStep:.1,zoom:1,zoomable:!0,dragable:!0,onClick:null,onUpdate:null},_create:function(){var b=this;this.element.is("img")||a.error("imgviewer plugin can only be applied to img elements"),b.img=b.element[0];var c=a(b.img);b.zimg=a("<img/>",{src:b.img.src}).appendTo("body").wrap("<div class='viewport'/>");var d=a(b.zimg);b.view=a(b.zimg).parent();var e=a(b.view);b.vCenter={},b.dragging=!1,b.pinch=!1,b.ready=!1,c.one("load",function(){b.ready=!0;var a=c.width(),f=c.height(),g=c.offset();b.offsetPadding={top:parseInt(c.css("padding-top"),10),left:parseInt(c.css("padding-left"),10),right:parseInt(c.css("padding-right"),10),bottom:parseInt(c.css("padding-bottom"),10)},b.offsetBorder={x:Math.round((c.outerWidth()-c.innerWidth())/2),y:Math.round((c.outerHeight()-c.innerHeight())/2)};var h=g.top+b.offsetBorder.y+b.offsetPadding.top,i=g.left+b.offsetBorder.x+b.offsetPadding.left;e.css({position:"absolute",overflow:"hidden",top:h+"px",left:i+"px",width:a+"px",height:f+"px"}),d.css({position:"relative",top:"0px",left:"0px",width:a+"px",height:f+"px","-webkit-tap-highlight-color":"transparent"}),b.vCenter={x:a/2,y:f/2},b.update()}).each(function(){this.complete&&a(this).load()}),b.render=!1,d.hammer(),b.options.zoomable&&b._bind_zoom_events(),b.options.dragable&&b._bind_drag_events(),d.on("tap",function(a){a.preventDefault(),b.dragging||(a.pageX=a.gesture.center.x+window.scrollX,a.pageY=a.gesture.center.y+window.scrollY,b._trigger("onClick",a,b))}),a(window).resize(function(){b.ready&&(b.vCenter.x*=c.width()/e.width(),b.vCenter.y*=c.height()/e.height(),b.update())})},_bind_zoom_events:function(){function b(){e.render||(e.render=!0,d())}function c(){e.render=!1}function d(){e.render&&(window.requestAnimationFrame(d),e.update())}var e=this,f=a(e.zimg);f.on("mousewheel",function(a){a.preventDefault();var b=a.deltaY;e.options.zoom-=b*e.options.zoomStep,e.update()}),f.data("hammer").recognizers[1].options.enable=!0,f.on("pinchstart",function(){}),f.on("pinch",function(a){if(a.preventDefault(),e.pinch){e.options.zoom=a.gesture.scale*e.pinchstart_scale;var c=e.imgToCursor(e.pinchstartrelpos.x,e.pinchstartrelpos.y);e.vCenter.x=e.vCenter.x+(c.x-e.pinchstart.x)/e.options.zoom,e.vCenter.y=e.vCenter.y+(c.y-e.pinchstart.y)/e.options.zoom}else e.pinchstart={x:a.gesture.center.x+window.scrollX,y:a.gesture.center.y+window.scrollY},e.pinchstartrelpos=e.cursorToImg(e.pinchstart.x,e.pinchstart.y),e.pinchstart_scale=e.options.zoom,b(),e.pinch=!0}),f.on("pinchend",function(a){a.preventDefault(),e.pinch&&(c(),e.update(),e.pinch=!1)})},_bind_drag_events:function(){function b(){e.render||(e.render=!0,d())}function c(){e.render=!1}function d(){e.render&&(window.requestAnimationFrame(d),e.update())}var e=this,f=a(e.zimg);f.on("panstart",function(a){a.preventDefault(),e.pinch||(e.dragXorg=e.vCenter.x,e.dragYorg=e.vCenter.y,b())}),f.on("panmove",function(a){a.preventDefault(),e.pinch||(e.vCenter.x=e.dragXorg-a.gesture.deltaX/e.options.zoom,e.vCenter.y=e.dragYorg-a.gesture.deltaY/e.options.zoom)}),f.on("panend",function(a){a.preventDefault(),e.pinch||(c(),e.update())})},_unbind_zoom_events:function(){var b=this,c=a(b.zimg);c.data("hammer").recognizers[1].options.enable=!1,c.off("mousewheel"),c.off("pinchstart"),c.off("pinch"),c.off("pinchend")},_unbind_drag_events:function(){var b=this,c=a(b.zimg);c.off("panstart"),c.off("panmove"),c.off("panend")},destroy:function(){var b=a(this.zimg);b.unbind("click"),a(window).unbind("resize"),b.remove(),a(this.view).remove(),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){switch(b){case"zoom":if(parseFloat(c)<1||isNaN(parseFloat(c)))return;break;case"zoomStep":if(parseFloat(c)<=0||isNaN(parseFloat(c)))return}var d=a.ui.version.split(".");switch(d[0]>1||d[1]>8?this._super(b,c):a.Widget.prototype._setOption.apply(this,arguments),b){case"zoom":this.ready&&this.update();break;case"zoomable":this.options.zoomable?this._bind_zoom_events():this._unbind_zoom_events();break;case"dragable":this.options.dragable?this._bind_drag_events():this._unbind_drag_events()}},addElem:function(b){a(this.view).append(b)},isVisible:function(a,b){var c=this.getView();return c?a>=c.left&&a<=c.right&&b>=c.top&&b<=c.bottom:!1},getView:function(){if(this.ready){var b=a(this.img),c=b.width(),d=b.height(),e=this.options.zoom;return{top:this.vCenter.y/d-.5/e,left:this.vCenter.x/c-.5/e,bottom:this.vCenter.y/d+.5/e,right:this.vCenter.x/c+.5/e}}return null},panTo:function(b,c){if(this.ready&&b>=0&&1>=b&&c>=0&&1>=c){var d=a(this.img),e=d.width(),f=d.height();return this.vCenter.x=b*e,this.vCenter.y=c*f,this.update(),{x:this.vCenter.x/e,y:this.vCenter.y/f}}return null},imgToView:function(b,c){if(this.ready&&b>=0&&1>=b&&c>=0&&1>=c){var d=a(this.img),e=d.width(),f=d.height(),g=e/2-this.vCenter.x*this.options.zoom,h=f/2-this.vCenter.y*this.options.zoom,i=b*e*this.options.zoom+g,j=c*f*this.options.zoom+h;return{x:Math.round(i),y:Math.round(j)}}return null},imgToCursor:function(b,c){var d=this.imgToView(b,c);if(d){var e=a(this.img).offset();return d.x+=e.left+this.offsetBorder.x+this.offsetPadding.left,d.y+=e.top+this.offsetBorder.y+this.offsetPadding.top,d}return null},viewToImg:function(b,c){if(this.ready){var d=a(this.img),e=d.width(),f=d.height(),g=e/2-this.vCenter.x*this.options.zoom,h=f/2-this.vCenter.y*this.options.zoom,i=(b-g)/(e*this.options.zoom),j=(c-h)/(f*this.options.zoom);return i>=0&&1>=i&&j>=0&&1>=j?{x:i,y:j}:null}return null},cursorToImg:function(b,c){if(this.ready){var d=a(this.img),e=d.width(),f=d.height(),g=d.offset(),h=e/2-this.vCenter.x*this.options.zoom,i=f/2-this.vCenter.y*this.options.zoom,j=(b-g.left-this.offsetBorder.x-this.offsetPadding.left-h)/(e*this.options.zoom),k=(c-g.top-this.offsetBorder.y-this.offsetPadding.top-i)/(f*this.options.zoom);return j>=0&&1>=j&&k>=0&&1>=k?{x:j,y:k}:null}return null},update:function(){if(this.ready){var b,c,d,e,f=a(this.img),g=f.width(),h=f.height(),i=f.offset(),j=this.options.zoom,k=g/2,l=h/2;1>=j?(b=0,c=0,d=g,e=h,this.vCenter={x:k,y:l},this.options.zoom=1,j=1):(b=Math.round(l-this.vCenter.y*j),c=Math.round(k-this.vCenter.x*j),d=Math.round(g*j),e=Math.round(h*j),c>0?(this.vCenter.x=k/j,c=0):g>c+d&&(this.vCenter.x=g-k/j,c=g-d),b>0?(this.vCenter.y=l/j,b=0):h>b+e&&(this.vCenter.y=h-l/j,b=h-e));var m=Math.round(i.top+this.offsetBorder.y+this.offsetPadding.top),n=Math.round(i.left+this.offsetBorder.x+this.offsetPadding.left);a(this.view).css({top:m+"px",left:n+"px",width:g+"px",height:h+"px"}),a(this.zimg).css({width:g+"px",height:h+"px"});var o=-(this.vCenter.x-k)*j,p=-(this.vCenter.y-l)*j;a(this.zimg).css({transform:"translate("+o+"px,"+p+"px) scale("+j+","+j+")"}),this._trigger("onUpdate",null,this)}}})}(jQuery);
\ No newline at end of file
+!function(a){a.widget("wgm.imgViewer",{options:{zoomStep:.1,zoom:1,zoomMax:0,zoomable:!0,dragable:!0,onClick:null,onUpdate:null},_create:function(){var b=this;this.element.is("img")||a.error("imgviewer plugin can only be applied to img elements"),b.img=b.element[0];var c=a(b.img);b.zimg=a("<img/>",{src:b.img.src}).appendTo("body").wrap("<div class='viewport'/>");var d=a(b.zimg);b.view=a(b.zimg).parent();var e=a(b.view);b.vCenter={},b.drag=!1,b.pinch=!1,b.ready=!1,c.one("load",function(){b.ready=!0;var a=c.width(),f=c.height(),g=c.offset();b.offsetPadding={top:parseInt(c.css("padding-top"),10),left:parseInt(c.css("padding-left"),10),right:parseInt(c.css("padding-right"),10),bottom:parseInt(c.css("padding-bottom"),10)},b.offsetBorder={x:Math.round((c.outerWidth()-c.innerWidth())/2),y:Math.round((c.outerHeight()-c.innerHeight())/2)};var h=g.top+b.offsetBorder.y+b.offsetPadding.top,i=g.left+b.offsetBorder.x+b.offsetPadding.left;e.css({position:"absolute",overflow:"hidden",top:h+"px",left:i+"px",width:a+"px",height:f+"px"}),d.css({position:"relative",top:"0px",left:"0px",width:a+"px",height:f+"px","-webkit-tap-highlight-color":"transparent"}),b.vCenter={x:a/2,y:f/2},b.update()}).each(function(){this.complete&&a(this).load()}),b.render=!1,d.hammer(),b.options.zoomable&&b._bind_zoom_events(),b.options.dragable&&b._bind_drag_events(),d.on("tap",function(a){a.preventDefault(),b.dragging||(a.pageX=a.gesture.center.x+window.scrollX,a.pageY=a.gesture.center.y+window.scrollY,b._trigger("onClick",a,b))}),a(window).resize(function(){b.ready&&(b.vCenter.x*=c.width()/e.width(),b.vCenter.y*=c.height()/e.height(),b.update())})},_bind_zoom_events:function(){function b(){e.render||(e.render=!0,d())}function c(){e.render=!1}function d(){e.render&&(window.requestAnimationFrame(d),e.update())}var e=this,f=a(e.zimg);f.on("mousewheel",function(a){a.preventDefault();var b=a.deltaY;e.options.zoom-=b*e.options.zoomStep,e.update()}),f.data("hammer").recognizers[1].options.enable=!0,f.on("pinchstart",function(){}),f.on("pinch",function(a){if(a.preventDefault(),e.pinch){e.options.zoom=a.gesture.scale*e.pinchstart_scale;var c=e.imgToCursor(e.pinchstartrelpos.x,e.pinchstartrelpos.y);e.vCenter.x=e.vCenter.x+(c.x-e.pinchstart.x)/e.options.zoom,e.vCenter.y=e.vCenter.y+(c.y-e.pinchstart.y)/e.options.zoom}else e.pinchstart={x:a.gesture.center.x+window.scrollX,y:a.gesture.center.y+window.scrollY},e.pinchstartrelpos=e.cursorToImg(e.pinchstart.x,e.pinchstart.y),e.pinchstart_scale=e.options.zoom,b(),e.pinch=!0}),f.on("pinchend",function(a){a.preventDefault(),e.pinch&&(c(),e.update(),e.pinch=!1)})},_bind_drag_events:function(){function b(){e.render||(e.render=!0,d())}function c(){e.render=!1}function d(){e.render&&(window.requestAnimationFrame(d),e.update())}var e=this,f=a(e.zimg);f.on("pan",function(a){a.preventDefault(),e.drag?(e.vCenter.x=e.dragXorg-a.gesture.deltaX/e.options.zoom,e.vCenter.y=e.dragYorg-a.gesture.deltaY/e.options.zoom):(e.drag=!0,e.dragXorg=e.vCenter.x,e.dragYorg=e.vCenter.y,b())}),f.on("panend",function(a){a.preventDefault(),e.drag&&(e.drag=!1,c(),e.update())})},_unbind_zoom_events:function(){var b=this,c=a(b.zimg);c.data("hammer").recognizers[1].options.enable=!1,c.off("mousewheel"),c.off("pinchstart"),c.off("pinch"),c.off("pinchend")},_unbind_drag_events:function(){var b=this,c=a(b.zimg);c.off("pan"),c.off("panend")},destroy:function(){var b=a(this.zimg);b.unbind("click"),a(window).unbind("resize"),b.remove(),a(this.view).remove(),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){switch(b){case"zoom":if(parseFloat(c)<1||isNaN(parseFloat(c)))return;break;case"zoomStep":if(parseFloat(c)<=0||isNaN(parseFloat(c)))return;break;case"zoomMax":if(parseFloat(c)<0||isNaN(parseFloat(c)))return}var d=a.ui.version.split(".");switch(d[0]>1||d[1]>8?this._super(b,c):a.Widget.prototype._setOption.apply(this,arguments),b){case"zoom":this.ready&&this.update();break;case"zoomable":this.options.zoomable?this._bind_zoom_events():this._unbind_zoom_events();break;case"dragable":this.options.dragable?this._bind_drag_events():this._unbind_drag_events()}},addElem:function(b){a(this.view).append(b)},isVisible:function(a,b){var c=this.getView();return c?a>=c.left&&a<=c.right&&b>=c.top&&b<=c.bottom:!1},getView:function(){if(this.ready){var b=a(this.img),c=b.width(),d=b.height(),e=this.options.zoom;return{top:this.vCenter.y/d-.5/e,left:this.vCenter.x/c-.5/e,bottom:this.vCenter.y/d+.5/e,right:this.vCenter.x/c+.5/e}}return null},panTo:function(b,c){if(this.ready&&b>=0&&1>=b&&c>=0&&1>=c){var d=a(this.img),e=d.width(),f=d.height();return this.vCenter.x=b*e,this.vCenter.y=c*f,this.update(),{x:this.vCenter.x/e,y:this.vCenter.y/f}}return null},imgToView:function(b,c){if(this.ready&&b>=0&&1>=b&&c>=0&&1>=c){var d=a(this.img),e=d.width(),f=d.height(),g=e/2-this.vCenter.x*this.options.zoom,h=f/2-this.vCenter.y*this.options.zoom,i=b*e*this.options.zoom+g,j=c*f*this.options.zoom+h;return{x:Math.round(i),y:Math.round(j)}}return null},imgToCursor:function(b,c){var d=this.imgToView(b,c);if(d){var e=a(this.img).offset();return d.x+=e.left+this.offsetBorder.x+this.offsetPadding.left,d.y+=e.top+this.offsetBorder.y+this.offsetPadding.top,d}return null},viewToImg:function(b,c){if(this.ready){var d=a(this.img),e=d.width(),f=d.height(),g=e/2-this.vCenter.x*this.options.zoom,h=f/2-this.vCenter.y*this.options.zoom,i=(b-g)/(e*this.options.zoom),j=(c-h)/(f*this.options.zoom);return i>=0&&1>=i&&j>=0&&1>=j?{x:i,y:j}:null}return null},cursorToImg:function(b,c){if(this.ready){var d=a(this.img),e=d.width(),f=d.height(),g=d.offset(),h=e/2-this.vCenter.x*this.options.zoom,i=f/2-this.vCenter.y*this.options.zoom,j=(b-g.left-this.offsetBorder.x-this.offsetPadding.left-h)/(e*this.options.zoom),k=(c-g.top-this.offsetBorder.y-this.offsetPadding.top-i)/(f*this.options.zoom);return j>=0&&1>=j&&k>=0&&1>=k?{x:j,y:k}:null}return null},update:function(){if(this.ready){var b,c,d,e,f=a(this.img),g=f.width(),h=f.height(),i=f.offset(),j=this.options.zoom,k=this.options.zoomMax,l=g/2,m=h/2;0!==k&&(j=Math.min(j,k),this.options.zoom=j),1>=j?(b=0,c=0,d=g,e=h,this.vCenter={x:l,y:m},this.options.zoom=1,j=1):(b=Math.round(m-this.vCenter.y*j),c=Math.round(l-this.vCenter.x*j),d=Math.round(g*j),e=Math.round(h*j),c>0?(this.vCenter.x=l/j,c=0):g>c+d&&(this.vCenter.x=g-l/j,c=g-d),b>0?(this.vCenter.y=m/j,b=0):h>b+e&&(this.vCenter.y=h-m/j,b=h-e));var n=Math.round(i.top+this.offsetBorder.y+this.offsetPadding.top),o=Math.round(i.left+this.offsetBorder.x+this.offsetPadding.left);a(this.view).css({top:n+"px",left:o+"px",width:g+"px",height:h+"px"}),a(this.zimg).css({width:g+"px",height:h+"px"});var p=-(this.vCenter.x-l)*j,q=-(this.vCenter.y-m)*j;a(this.zimg).css({transform:"translate("+p+"px,"+q+"px) scale("+j+","+j+")"}),this._trigger("onUpdate",null,this)}}})}(jQuery);
\ No newline at end of file
diff --git a/imgViewer.jquery.json b/imgViewer.jquery.json
index f49a097..4c98a32 100644
--- a/imgViewer.jquery.json
+++ b/imgViewer.jquery.json
@@ -2,7 +2,7 @@
   "name": "imgViewer",
   "title": "jQuery imgViewer",
   "description": "jQuery plugin to zoom and pan images, even those with a size that is a percentage of their container.",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "homepage": "",
   "author": {
     "name": "Wayne Mogg"
diff --git a/package.json b/package.json
index e7b3fd4..d956929 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-imgViewer-plugin",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "engines": {
     "node": ">= 0.8.0"
   },
diff --git a/src/imgViewer.js b/src/imgViewer.js
index 6dd8851..a6ac120 100644
--- a/src/imgViewer.js
+++ b/src/imgViewer.js
@@ -15,6 +15,7 @@
 		options: {
 			zoomStep: 0.1,
 			zoom: 1,
+			zoomMax: 0,
 			zoomable: true,
 			dragable: true,
 			onClick: null,
@@ -219,7 +220,6 @@
 			}
 			$zimg.on("pan", function(ev) {
 				ev.preventDefault();
-				console.log(ev.type);
 				if (!self.drag) {
 					self.drag = true;
 					self.dragXorg = self.vCenter.x;
@@ -239,36 +239,6 @@
 					self.update();
 				}
 			});
-
-/*			$zimg.on( "panstart" , function(ev) {
-				ev.preventDefault();
-				if (!self.pinch) {
-					self.drag = true;
-					self.dragXorg = self.vCenter.x;
-					self.dragYorg = self.vCenter.y;
-					startRenderLoop();
-					console.log("panstart");
-				}
-			});
-
-			$zimg.on( "panmove", function(ev) {
-				ev.preventDefault();
-				if (!self.pinch) {
-					self.vCenter.x = self.dragXorg - ev.gesture.deltaX/self.options.zoom;
-					self.vCenter.y = self.dragYorg - ev.gesture.deltaY/self.options.zoom;
-					console.log("panmove");
-				}
-			});
-				
-			$zimg.on( "panend", function(ev) {
-				ev.preventDefault();
-				if (!self.pinch) {
-					self.drag = false;
-					stopRenderLoop();
-					self.update();
-				}
-			});
-*/	
 		},
 /*
  *	Unbind events
@@ -314,6 +284,11 @@
 						return;
 					}
 					break;
+				case 'zoomMax':
+					if (parseFloat(value) < 0 || isNaN(parseFloat(value))) {
+						return;
+					}
+					break;
 			}
 			var version = $.ui.version.split('.');
 			if (version[0] > 1 || version[1] > 8) {
@@ -481,9 +456,14 @@
 					height = $img.height(),
 					offset = $img.offset(),
 					zoom = this.options.zoom,
+					zoomMax = this.options.zoomMax,
 					half_width = width/2,
 					half_height = height/2;
   
+				if (zoomMax !==0) {
+						zoom = Math.min(zoom, zoomMax);
+						this.options.zoom = zoom;
+				}
 				if (zoom <= 1) {
 					zTop = 0;
 					zLeft = 0;
diff --git a/test/imgViewer_options.js b/test/imgViewer_options.js
index b4e05d9..91b643d 100644
--- a/test/imgViewer_options.js
+++ b/test/imgViewer_options.js
@@ -4,8 +4,8 @@
 (function($) {
 	module("imgViewer: options");
 	
-	test( "zoom option", 3, function() {
-		var $img = $("#qunit-fixture img");
+test( "zoom option", 3, function() {
+	var $img = $("#qunit-fixture img");
 	var zoom = 5;
 	var tst = $img.imgViewer({
 		zoom: zoom
@@ -34,6 +34,21 @@ test( "zoomStep option", 3, function() {
 	tst.remove();
 });
 
+test( "zoomMax option", 3, function() {
+	var $img = $("#qunit-fixture img");
+	var zmax = 5;
+	var tst = $img.imgViewer({
+		zoomMax: zmax
+	});
+	equal(tst.imgViewer("option", "zoomMax"), zmax, "set zoomMax option in constructor");
+	zmax = 4;
+	tst.imgViewer("option", "zoomMax", zmax);
+	equal(tst.imgViewer("option", "zoomMax"), zmax, "set zoomMax option on built object");
+	tst.imgViewer("option", "zoom", 5);
+	equal(tst.imgViewer("option", "zoom"), zmax, "zoom restricted by zoomMax");
+	tst.remove();
+});
+
 test( "zoomable option", 2, function() {
 	var $img = $("#qunit-fixture img");
 	var zoom = false;