stop the stuff from happening for normal clicks

kastner · Apr 22, 2011 · 42fddd2 · 42fddd2
1 parent 71064fb
commit 42fddd2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/jquery.gangZoom.js b/jquery.gangZoom.js
@@ -64,8 +64,6 @@
                 if (self.mouseDown) {
                     if (event.target == self.img || event.target == self.float[0]) {
                         self.go();
-                    } else {
-                        self.cancel();
                     }
                 }
             })
@@ -85,9 +83,13 @@
             self.img.mousedown(function (event) {
                 event.preventDefault();
                 self.shouldStopClick = false;
+                self.stopped = false;
                 var evt = event;
 
                 setTimeout(function () {
+                    if (self.stopped) {
+                        return;
+                    }
                     evt.stopPropagation();
                     var clickX = evt.pageX;
                     var clickY = evt.pageY;
@@ -128,11 +130,15 @@
             .mouseup(function (evt) {
                 if (self.mouseDown) {
                     self.go();
+                } else {
+                    self.cancel();
                 }
             })
             .click(function (event) {
                 if (self.shouldStopClick) {
                     event.preventDefault();
+                } else {
+                    self.stopped = true;
                 }
             });
         });

diff --git a/test.html b/test.html
@@ -55,6 +55,6 @@
       <input type="text" id="datepicker-ce">
       <span class="human"></span>
     </div>
-    <img class="zoomable" src="http://cl.ly/1s1C0m1E0m45353i0u41/content"></img>
+    <a href="test.html" onclick="alert('foo'); return false;"><img class="zoomable" src="http://cl.ly/1s1C0m1E0m45353i0u41/content"></img></a>
   </body>
 </html>