Merge pull request aframevr#4000 from dmarcos/emitClick

Always emit cursor click events if mouse based cursor enabled

Author: ngokevin

src/components/cursor.js

@@ -242,6 +242,7 @@ module.exports.Component = registerComponent('cursor', {
    *   in case user mousedowned one entity, dragged to another, and mouseupped.
    */
   onCursorUp: function (evt) {
+    var data = this.data;
     this.twoWayEmit(EVENTS.MOUSEUP);
 
     // If intersected entity has changed since the cursorDown, still emit mouseUp on the
@@ -251,7 +252,8 @@ module.exports.Component = registerComponent('cursor', {
       this.cursorDownEl.emit(EVENTS.MOUSEUP, this.intersectedEventDetail);
     }
 
-    if (!this.data.fuse && this.intersectedEl && this.cursorDownEl === this.intersectedEl) {
+    if ((!data.fuse || data.rayOrigin === 'mouse') &&
+        this.intersectedEl && this.cursorDownEl === this.intersectedEl) {
       this.twoWayEmit(EVENTS.CLICK);
     }
 

tests/components/cursor.test.js

@@ -155,6 +155,16 @@ suite('cursor', function () {
       });
       component.onCursorUp();
     });
+
+    test('emits click event on intersectedEl when fuse and mouse cursor enabled', function (done) {
+      el.setAttribute('cursor', 'fuse', true);
+      el.setAttribute('cursor', 'rayOrigin', 'mouse');
+      component.intersection = intersection;
+      component.intersectedEl = intersectedEl;
+      component.cursorDownEl = intersectedEl;
+      once(intersectedEl, 'click', function () { done(); });
+      component.onCursorUp({type: 'touchend', preventDefault: function () {}});
+    });
   });
 
   suite('onIntersection', function () {