From a7f3627c922b3841ef812f6a1b8356f62934f801 Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Fri, 6 Apr 2018 13:37:37 -0700
Subject: [PATCH] NAF.utils.getNetworkId doesn't work correctly atm, so don't
use it.
---
src/components/networked-counter.js | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/components/networked-counter.js b/src/components/networked-counter.js
index 9c4fb7105..41aa1878a 100644
--- a/src/components/networked-counter.js
+++ b/src/components/networked-counter.js
@@ -31,8 +31,8 @@ AFRAME.registerComponent("networked-counter", {
return;
}
- const id = NAF.utils.getNetworkId(networkedEl);
- if (this.queue.hasOwnProperty(id)) {
+ const id = this._getNetworkId(networkedEl);
+ if (id && this.queue.hasOwnProperty(id)) {
return;
}
@@ -60,8 +60,8 @@ AFRAME.registerComponent("networked-counter", {
},
deregister: function(networkedEl) {
- const id = NAF.utils.getNetworkId(networkedEl);
- if (this.queue.hasOwnProperty(id)) {
+ const id = this._getNetworkId(networkedEl);
+ if (id && this.queue.hasOwnProperty(id)) {
const item = this.queue[id];
networkedEl.removeEventListener(this.data.grab_event, item.onGrabHandler);
networkedEl.removeEventListener(this.data.release_event, item.onReleaseHandler);
@@ -126,5 +126,12 @@ AFRAME.registerComponent("networked-counter", {
_destroy: function(networkedEl) {
networkedEl.parentNode.removeChild(networkedEl);
+ },
+
+ _getNetworkId: function(networkedEl) {
+ if (networkedEl.components.hasOwnProperty("networked")) {
+ return networkedEl.components["networked"].data.networkId;
+ }
+ return null;
}
});
--
GitLab