From b662f500bee34e1f4013871ce000014dfd19636d Mon Sep 17 00:00:00 2001
From: Jack Moore <hello@jacklmoore.com>
Date: Wed, 16 Oct 2013 00:05:12 -0400
Subject: [PATCH] Added simple fallback for touch events. Fixes #37 #39 Renamed
 minified file to jquery.zoom.min.js to match jQuery's convention.

---
 bower.json         |  2 +-
 demo.html          |  2 +-
 jquery.zoom-min.js |  7 ------
 jquery.zoom.js     | 57 +++++++++++++++++++---------------------------
 jquery.zoom.min.js |  7 ++++++
 readme.md          |  4 ++++
 zoom.jquery.json   |  2 +-
 7 files changed, 38 insertions(+), 43 deletions(-)
 delete mode 100644 jquery.zoom-min.js
 create mode 100644 jquery.zoom.min.js

diff --git a/bower.json b/bower.json
index 7fc1c95..7fa14a2 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
 	"name": "jquery-zoom",
 	"description": "Enlarge images on click or mouseover.",
-	"version": "1.7.8",
+	"version": "1.7.9",
 	"dependencies": {
 		"jquery": ">=1.7"
 	},
diff --git a/demo.html b/demo.html
index f989ff1..0079ac6 100644
--- a/demo.html
+++ b/demo.html
@@ -35,7 +35,7 @@
 		#ex2 img:hover { cursor: url(grab.cur), default; }
 		#ex2 img:active { cursor: url(grabbed.cur), default; }
 	</style>
-	<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js'></script>
+	<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'></script>
 	<script src='jquery.zoom.js'></script>
 	<script>
 		$(document).ready(function(){
diff --git a/jquery.zoom-min.js b/jquery.zoom-min.js
deleted file mode 100644
index c36745d..0000000
--- a/jquery.zoom-min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-	Zoom v1.7.8 - 2013-07-30
-	Enlarge images on click or mouseover.
-	(c) 2013 Jack Moore - http://www.jacklmoore.com/zoom
-	license: http://www.opensource.org/licenses/mit-license.php
-*/
-(function(o){var t={url:!1,callback:!1,target:!1,duration:120,on:"mouseover",onZoomIn:!1,onZoomOut:!1};o.zoom=function(t,n,e){var i,u,c,m,a,r=o(t).css("position");return o(t).css({position:/(absolute|fixed)/.test(r)?r:"relative",overflow:"hidden"}),e.style.width=e.style.height="",o(e).addClass("zoomImg").css({position:"absolute",top:0,left:0,opacity:0,width:e.width,height:e.height,border:"none",maxWidth:"none"}).appendTo(t),{init:function(){i=o(t).outerWidth(),u=o(t).outerHeight(),c=(e.width-i)/o(n).outerWidth(),m=(e.height-u)/o(n).outerHeight(),a=o(n).offset()},move:function(o){var t=o.pageX-a.left,n=o.pageY-a.top;n=Math.max(Math.min(n,u),0),t=Math.max(Math.min(t,i),0),e.style.left=t*-c+"px",e.style.top=n*-m+"px"}}},o.fn.zoom=function(n){return this.each(function(){var e,i=o.extend({},t,n||{}),u=i.target||this,c=this,m=document.createElement("img"),a=o(m),r="mousemove.zoom",l=!1;(i.url||(e=o(c).find("img"),e[0]&&(i.url=e.data("src")||e.attr("src")),i.url))&&(m.onload=function(){function t(t){e.init(),e.move(t),a.stop().fadeTo(o.support.opacity?i.duration:0,1,o.isFunction(i.onZoomIn)?i.onZoomIn.call(m):!1)}function n(){a.stop().fadeTo(i.duration,0,o.isFunction(i.onZoomOut)?i.onZoomOut.call(m):!1)}var e=o.zoom(u,c,m);"grab"===i.on?o(c).on("mousedown.zoom",function(i){1===i.which&&(o(document).one("mouseup.zoom",function(){n(),o(document).off(r,e.move)}),t(i),o(document).on(r,e.move),i.preventDefault())}):"click"===i.on?o(c).on("click.zoom",function(i){return l?void 0:(l=!0,t(i),o(document).on(r,e.move),o(document).one("click.zoom",function(){n(),l=!1,o(document).off(r,e.move)}),!1)}):"toggle"===i.on?o(c).on("click.zoom",function(o){l?n():t(o),l=!l}):(e.init(),o(c).on("mouseenter.zoom",t).on("mouseleave.zoom",n).on(r,e.move)),o.isFunction(i.callback)&&i.callback.call(m)},m.src=i.url,o(c).one("zoom.destroy",function(){o(c).off(".zoom"),a.remove()}))})},o.fn.zoom.defaults=t})(window.jQuery);
\ No newline at end of file
diff --git a/jquery.zoom.js b/jquery.zoom.js
index 3e0c8d3..14af964 100644
--- a/jquery.zoom.js
+++ b/jquery.zoom.js
@@ -1,5 +1,5 @@
 /*!
-	Zoom v1.7.8 - 2013-07-30
+	Zoom v1.7.9 - 2013-10-16
 	Enlarge images on click or mouseover.
 	(c) 2013 Jack Moore - http://www.jacklmoore.com/zoom
 	license: http://www.opensource.org/licenses/mit-license.php
@@ -10,7 +10,8 @@
 		callback: false,
 		target: false,
 		duration: 120,
-		on: 'mouseover', // other options: 'grab', 'click', 'toggle'
+		on: 'mouseover', // other options: grab, click, toggle
+		touch: true, // enables a touch fallback
 		onZoomIn: false,
 		onZoomOut: false
 	};
@@ -79,6 +80,7 @@
 			$img = $(img),
 			mousemove = 'mousemove.zoom',
 			clicked = false,
+			touched = false,
 			$urlElement;
 
 			// If a url wasn't specified, look for an image element.
@@ -110,6 +112,7 @@
 					.fadeTo(settings.duration, 0, $.isFunction(settings.onZoomOut) ? settings.onZoomOut.call(img) : false);
 				}
 
+				// Mouse events
 				if (settings.on === 'grab') {
 					$(source)
 						.on('mousedown.zoom',
@@ -130,17 +133,7 @@
 									e.preventDefault();
 								}
 							}
-						)
-						.on('touchstart.zoom', function (e) { 
-							e.preventDefault();
-							start( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
-						})
-						.on('touchmove.zoom', function (e) { 
-							e.preventDefault();
-							zoom.move( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
-						})
-						.on('touchend.zoom', stop);
-
+						);
 				} else if (settings.on === 'click') {
 					$(source).on('click.zoom',
 						function (e) {
@@ -150,24 +143,12 @@
 							} else {
 								clicked = true;
 								start(e);
-								$(document)
-									.on(mousemove, zoom.move)
-									.on('touchstart.zoom', function (e) { 
-										// no e.preventDefault() cause it will be impossible to turn off with a click
-										start( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
-									})
-									.on('touchmove.zoom', function (e) { 
-										e.preventDefault();
-										zoom.move( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
-									});
+								$(document).on(mousemove, zoom.move);
 								$(document).one('click.zoom',
 									function () {
 										stop();
 										clicked = false;
-										$(document)
-											.off(mousemove, zoom.move)
-											.off('touchstart.zoom')
-											.off('touchmove.zoom');
+										$(document).off(mousemove, zoom.move);
 									}
 								);
 								return false;
@@ -185,24 +166,34 @@
 							clicked = !clicked;
 						}
 					);
-				} else {
+				} else if (settings.on === 'mouseover') {
 					zoom.init(); // Preemptively call init because IE7 will fire the mousemove handler before the hover handler.
 
 					$(source)
 						.on('mouseenter.zoom', start)
 						.on('mouseleave.zoom', stop)
-						.on(mousemove, zoom.move)
+						.on(mousemove, zoom.move);
+				}
+
+				// Touch fallback
+				if (settings.touch) {
+					$(source)
 						.on('touchstart.zoom', function (e) { 
 							e.preventDefault();
-							start( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
+							if (touched) {
+								touched = false;
+								stop();
+							} else {
+								touched = true;
+								start( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
+							}
 						})
 						.on('touchmove.zoom', function (e) { 
 							e.preventDefault();
 							zoom.move( e.originalEvent.touches[0] || e.originalEvent.changedTouches[0] );
-						})
-						.on('touchend.zoom', stop);
+						});
 				}
-
+				
 				if ($.isFunction(settings.callback)) {
 					settings.callback.call(img);
 				}
diff --git a/jquery.zoom.min.js b/jquery.zoom.min.js
new file mode 100644
index 0000000..cfd92d0
--- /dev/null
+++ b/jquery.zoom.min.js
@@ -0,0 +1,7 @@
+/*!
+	Zoom v1.7.9 - 2013-10-16
+	Enlarge images on click or mouseover.
+	(c) 2013 Jack Moore - http://www.jacklmoore.com/zoom
+	license: http://www.opensource.org/licenses/mit-license.php
+*/
+(function(o){var t={url:!1,callback:!1,target:!1,duration:120,on:"mouseover",touch:!0,onZoomIn:!1,onZoomOut:!1};o.zoom=function(t,n,e){var i,u,c,a,m,r=o(t).css("position");return o(t).css({position:/(absolute|fixed)/.test(r)?r:"relative",overflow:"hidden"}),e.style.width=e.style.height="",o(e).addClass("zoomImg").css({position:"absolute",top:0,left:0,opacity:0,width:e.width,height:e.height,border:"none",maxWidth:"none"}).appendTo(t),{init:function(){i=o(t).outerWidth(),u=o(t).outerHeight(),c=(e.width-i)/o(n).outerWidth(),a=(e.height-u)/o(n).outerHeight(),m=o(n).offset()},move:function(o){var t=o.pageX-m.left,n=o.pageY-m.top;n=Math.max(Math.min(n,u),0),t=Math.max(Math.min(t,i),0),e.style.left=t*-c+"px",e.style.top=n*-a+"px"}}},o.fn.zoom=function(n){return this.each(function(){var e,i=o.extend({},t,n||{}),u=i.target||this,c=this,a=document.createElement("img"),m=o(a),r="mousemove.zoom",l=!1,s=!1;(i.url||(e=o(c).find("img"),e[0]&&(i.url=e.data("src")||e.attr("src")),i.url))&&(a.onload=function(){function t(t){e.init(),e.move(t),m.stop().fadeTo(o.support.opacity?i.duration:0,1,o.isFunction(i.onZoomIn)?i.onZoomIn.call(a):!1)}function n(){m.stop().fadeTo(i.duration,0,o.isFunction(i.onZoomOut)?i.onZoomOut.call(a):!1)}var e=o.zoom(u,c,a);"grab"===i.on?o(c).on("mousedown.zoom",function(i){1===i.which&&(o(document).one("mouseup.zoom",function(){n(),o(document).off(r,e.move)}),t(i),o(document).on(r,e.move),i.preventDefault())}):"click"===i.on?o(c).on("click.zoom",function(i){return l?void 0:(l=!0,t(i),o(document).on(r,e.move),o(document).one("click.zoom",function(){n(),l=!1,o(document).off(r,e.move)}),!1)}):"toggle"===i.on?o(c).on("click.zoom",function(o){l?n():t(o),l=!l}):"mouseover"===i.on&&(e.init(),o(c).on("mouseenter.zoom",t).on("mouseleave.zoom",n).on(r,e.move)),i.touch&&o(c).on("touchstart.zoom",function(o){o.preventDefault(),s?(s=!1,n()):(s=!0,t(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0]))}).on("touchmove.zoom",function(o){o.preventDefault(),e.move(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0])}),o.isFunction(i.callback)&&i.callback.call(a)},a.src=i.url,o(c).one("zoom.destroy",function(){o(c).off(".zoom"),m.remove()}))})},o.fn.zoom.defaults=t})(window.jQuery);
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 50a344a..86b2045 100644
--- a/readme.md
+++ b/readme.md
@@ -4,6 +4,10 @@ A small jQuery plugin for zooming images on mouseover or mousedown. See the [pro
  
 ## Changelog:
 
+### v1.7.9 - 2013/10/16
+* Added simple fallback for touch events. Fixes #37 #39
+* Renamed minified file to jquery.zoom.min.js to match jQuery's convention.
+
 ### v1.7.8 - 2013/7/30
 * Will use data-src attribute if present before checking for the presence of an src attribute.
 
diff --git a/zoom.jquery.json b/zoom.jquery.json
index 5046980..c58c6e4 100644
--- a/zoom.jquery.json
+++ b/zoom.jquery.json
@@ -2,7 +2,7 @@
 	"name": "zoom",
 	"title": "Zoom",
 	"description": "Enlarge images on click or mouseover.",
-	"version": "1.7.8",
+	"version": "1.7.9",
 	"dependencies": {
 		"jquery": ">=1.7"
 	},