Close flyout if event is outside, closes i-like-robots#19

bjornmeansbear · Jan 9, 2014 · 0223b71 · 0223b71
1 parent 94722a7
commit 0223b71
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/dist/easyzoom.js b/dist/easyzoom.js
diff --git a/src/easyzoom.js b/src/easyzoom.js
@@ -181,16 +181,20 @@
         var xt = pt * rh;
         var xl = pl * rw;
 
-        xt = (xt > dh) ? dh : xt;
-        xl = (xl > dw) ? dw : xl;
+        // xt = (xt > dh) ? dh : xt;
+        // xl = (xl > dw) ? dw : xl;
 
-        // Do not move the image if the event is outside
-        if (xl > 0 && xt > 0) {
+        // Close if outside
+        if (xl < 0 || xt < 0 || xl > dw || xt > dh) {
+            this.hide();
+        }
+        else {
             this.$zoom.css({
                 top:  '' + (Math.ceil(xt) * -1) + 'px',
                 left: '' + (Math.ceil(xl) * -1) + 'px'
             });
         }
+
     };
 
     /**

diff --git a/test/spec/easyzoom.js b/test/spec/easyzoom.js
@@ -151,7 +151,7 @@
 
     asyncTest("_move(e)", function() {
 
-        expect(4);
+        expect(5);
 
         var offset = api.$target.position();
 
@@ -167,6 +167,14 @@
             pageY: offset.top + 100
         };
 
+        var mock_3 = {
+            type: "mousemove",
+            pageX: offset.left - 10,
+            pageY: offset.top - 10
+        };
+
+        var spy = sinon.spy(api, "hide");
+
         // Must open the flyout with a zoom image first
         api.opts.onShow = function() {
             var left, top;
@@ -187,6 +195,10 @@
             equal(left, -200, "2x scale zoom image moved 200px left given 100px offset");
             equal(top, -200, "2x scale zoom image moved 200px top given 100px offset");
 
+            api._move(mock_3);
+
+            equal(spy.calledOnce, true, ".hide() is called if event is outside");
+
             start();
         };