Merge pull request #1 from kvas-damian/Fix-touch-devices

Fix touch devices

addon/system/target.js

@@ -107,7 +107,8 @@ var Target = Ember.Object.extend(Ember.Evented, {
       focusout:   bind(this, 'blur'),
       mouseenter: bind(this, 'mouseEnter'),
       mouseleave: bind(this, 'mouseLeave'),
-      mousedown:  bind(this, 'mouseDown')
+      mousedown:  bind(this, 'mouseDown'),
+      touchstart:  bind(this, 'mouseDown')
     };
 
     if (get(target, 'element')) {
@@ -267,7 +268,7 @@ var Target = Ember.Object.extend(Ember.Evented, {
 
       var eventManager = this.eventManager;
       eventManager.mouseup = bind(this, 'mouseUp');
-      $(document).on('mouseup', eventManager.mouseup);
+      $(document).on('mouseup touchend', eventManager.mouseup);
 
       evt.preventDefault();
     }
@@ -279,7 +280,7 @@ var Target = Ember.Object.extend(Ember.Evented, {
   mouseUp: function (evt) {
     // Remove mouseup event
     var eventManager = this.eventManager;
-    $(document).off('mouseup', eventManager.mouseup);
+    $(document).off('mouseup touchend', eventManager.mouseup);
     eventManager.mouseup = null;
 
     var label = labelForEvent(evt);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-pop-over",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "A constraint-based pop-over component for ember apps",
   "directories": {
     "doc": "doc",
@@ -47,4 +47,4 @@
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}

tests/acceptance/events-test.js

@@ -3,6 +3,8 @@ import startApp from '../helpers/start-app';
 import mouseUp from '../helpers/mouse-up';
 import simpleClick from '../helpers/simple-click';
 import mouseDown from '../helpers/mouse-down';
+import touchStart from '../helpers/touch-start';
+import touchEnd from '../helpers/touch-end';
 import mouseEnter from '../helpers/mouse-enter';
 import mouseLeave from '../helpers/mouse-leave';
 import focus from '../helpers/focus';
@@ -21,7 +23,7 @@ module('Acceptance: Events', {
 });
 
 test('on="click"', function() {
-  expect(6);
+  expect(9);
   visit('/');
 
   simpleClick("#click");
@@ -59,10 +61,33 @@ test('on="click"', function() {
   andThen(function () {
     ok(find(".pop-over-container:visible").length === 1);
   });
+
+  simpleClick("#click");
+  andThen(function () {
+    ok(find(".pop-over-container:visible").length === 0);
+  });
+
+  touchStart("#click");
+  andThen(function () {
+    ok(find(".pop-over-container:visible").length === 1);
+  });
+
+  andThen(function () {
+    var defer = Ember.RSVP.defer();
+    later(defer, 'resolve', 400);
+    return defer.promise;
+  });
+
+  touchEnd("#click");
+  andThen(function () {
+    ok(find(".pop-over-container:visible").length === 1);
+  });
+
+
 });
 
 test('on="click hold"', function() {
-  expect(4);
+  expect(6);
   visit('/');
 
   mouseDown("#click-hold");
@@ -81,6 +106,22 @@ test('on="click hold"', function() {
     ok(find(".pop-over-container:visible").length === 0);
   });
 
+  touchStart("#click-hold");
+  andThen(function () {
+    ok(find(".pop-over-container:visible").length === 1);
+  });
+
+  andThen(function () {
+    var defer = Ember.RSVP.defer();
+    later(defer, 'resolve', 400);
+    return defer.promise;
+  });
+
+  touchStop("#click-hold");
+  andThen(function () {
+    ok(find(".pop-over-container:visible").length === 0);
+  });
+
   simpleClick("#click-hold");
   andThen(function () {
     ok(find(".pop-over-container:visible").length === 1);

tests/helpers/touch-end.js

@@ -0,0 +1,3 @@
+export default function (selector) {
+  triggerEvent(selector, "touchend");
+}

tests/helpers/touch-start.js

@@ -0,0 +1,3 @@
+export default function (selector) {
+  triggerEvent(selector, "touchstart");
+}