fix toggling on entities

mattrei · Apr 3, 2019 · a03570b · a03570b
1 parent eb3a67b
commit a03570b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -48,7 +48,7 @@ AFRAME.registerComponent('toggle-controls', {
 
   update: function (oldData) {
     const data = this.data;
-    this.toggled =data.toggled;
+    this.toggled = data.toggled;
     this.eventCond = data.eventCond && data.eventCond.split('=').length == 2 ? data.eventCond.split('=') : null;
   },
 
@@ -80,11 +80,14 @@ AFRAME.registerComponent('toggle-controls', {
       if (evt[this.eventCond[0]] !== this.eventCond[1]) return;
     }
 
-    //  HACK: listen only on events coming from the canvas
     if (
+      evt.target.tagName === 'A-ENTITY' 
+      || evt.target.tagName === 'A-SCENE'
+      /*
       evt.target.tagName === 'CANVAS' 
       || evt.target.tagName === 'A-SCENE'
       || evt.target.tagName === 'BODY'
+      */
     ) { 
       if (data.type === 'double') {
         if (this.clickTimer == null) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aframe-toggle-controls-component",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A Toggle Controls component for A-Frame.",
   "main": "index.js",
   "unpkg": "dist/aframe-toggle-controls-component.min.js",