From b8566f7e906252a088c5761172cd44c0d60042fd Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Thu, 19 Apr 2018 15:18:22 -0700
Subject: [PATCH] don't use "selectorAll", it seems to break the inspector.
---
src/components/cursor-controller.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/components/cursor-controller.js b/src/components/cursor-controller.js
index 7804b64f9..aa54b3e95 100644
--- a/src/components/cursor-controller.js
+++ b/src/components/cursor-controller.js
@@ -12,7 +12,7 @@ AFRAME.registerComponent("cursor-controller", {
playerRig: { type: "selector" },
otherHand: { type: "string" },
hand: { default: "right" },
- trackedControls: { type: "selectorAll", default: "[tracked-controls]" },
+ trackedControls: { type: "string", default: "[tracked-controls]" },
maxDistance: { default: 3 },
minDistance: { default: 0.5 },
cursorColorHovered: { default: "#FF0000" },
@@ -81,6 +81,10 @@ AFRAME.registerComponent("cursor-controller", {
if (oldData.otherHand && this.data.otherHand !== oldData.otherHand) {
this._handleModelLoaded();
}
+
+ if (this.data.trackedControls !== oldData.trackedControls) {
+ this.trackedControls = document.querySelectorAll(this.data.trackedControls) || [];
+ }
},
play: function() {
@@ -236,8 +240,8 @@ AFRAME.registerComponent("cursor-controller", {
_getController: function() {
//TODO: prefer initial hand set in data.hand
- for (let i = this.data.trackedControls.length - 1; i >= 0; i--) {
- const trackedControlsComponent = this.data.trackedControls[i].components["tracked-controls"];
+ for (let i = this.trackedControls.length - 1; i >= 0; i--) {
+ const trackedControlsComponent = this.trackedControls[i].components["tracked-controls"];
if (trackedControlsComponent && trackedControlsComponent.controller) {
return trackedControlsComponent.controller;
}
--
GitLab