Remove . from the activators

Author: fernandojsg

examples/basic/index.html

@@ -87,11 +87,11 @@
         'vive-controls': {
           gripdown: 'changeTask',
           //trackpaddown: 'logdefault',
-          'trackpad.doubletouch': 'doubletouch',
-          'trackpad.doublepress': 'doublepress',
-          //'trackpad.longpress': 'longpress',
+          'trackpaddoubletouch': 'doubletouch',
+          'trackpaddoublepress': 'doublepress',
+          //'trackpadlongpress': 'longpress',
           'trackpaddpadleftdown': 'dpadleft',
-          'trackpaddpadright.longpress': 'dpadrightlong'
+          'trackpaddpadrightlongpress': 'dpadrightlong'
         },
         'oculus-touch-controls': {
           abuttondown: 'changeTask'

src/activators/doublepress.js

@@ -20,8 +20,7 @@ DoublePress.prototype = {
     }
   },
 
-  removeListeners () {
-    console.log('destroying');
+  destroy () {
     this.el.removeEventListener(this.eventName, this.onButtonDown);
   }
 }

src/activators/doubletouch.js

@@ -21,7 +21,6 @@ DoubleTouch.prototype = {
   },
 
   removeListeners () {
-    console.log('destroying');
     this.el.removeEventListener(this.eventName, this.onButtonDown);
   }
 }

src/activators/longpress.js

@@ -27,7 +27,6 @@ LongPress.prototype = {
   },
 
   removeListeners () {
-    console.log('destroying');
     this.el.removeEventListener(this.eventNameDown, this.onButtonDown);
     this.el.removeEventListener(this.eventNameUp, this.onButtonUp);
   }

src/index.js

@@ -175,22 +175,28 @@ AFRAME.registerSystem('input-mapping', {
       } 
     }; 
 
+    function checkActivator (eventName) {
+      for (var activatorSuffix in AFRAME.inputActivators) {
+        if (eventName.endsWith(activatorSuffix)) {
+          return activatorSuffix;
+        }
+      }
+      return null;
+    }
+
     for (var eventName in mappingsPerController.mappings) {
-      var modifier = null;
-      if (eventName.indexOf('.') !== -1) {
-        var aux = eventName.split('.');
-        button = aux[0]; // eg: trackpad
-        modifierName = aux[1]; // eg: doublepress
-        var Activator = AFRAME.inputActivators[modifierName];
-        if (!Activator) {
-          console.error('input-mapping: No activator found');
+      // Check for activators
+      for (var activatorSuffix in AFRAME.inputActivators) {
+        if (eventName.endsWith(activatorSuffix)) {
+          AFRAME.inputActivators[activatorSuffix];
+          var button = eventName.substr(0, eventName.indexOf(activatorSuffix));
+          var Activator = AFRAME.inputActivators[activatorSuffix];
+          var onActivate = OnActivate(eventName);
+          controllerObj.activators[eventName] = new Activator(controllerObj.element, button, onActivate);
           break;
         }
-
-        var onActivate = OnActivate(eventName);
-        controllerObj.activators[eventName] = new Activator(controllerObj.element, button, onActivate);
       }
-
+      
       var onActivate = OnActivate(eventName);
       controllerObj.element.addEventListener(eventName, onActivate);
       controllerObj.handlers[eventName] = onActivate;