From a552ea0587a4b0d0282f271fa9a9ef241295bc58 Mon Sep 17 00:00:00 2001
From: Kevin Lee <klee@mozilla.com>
Date: Fri, 6 Apr 2018 14:20:53 -0700
Subject: [PATCH] just point back to dev fork instead
---
package.json | 2 +-
src/components/networked-counter.js | 13 +++----------
yarn.lock | 6 +++---
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/package.json b/package.json
index 37c85f02d..93154d2d9 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
"mobile-detect": "^1.4.1",
"moving-average": "^1.0.0",
"naf-janus-adapter": "https://github.com/mozilla/naf-janus-adapter#feature/disconnect",
- "networked-aframe": "https://github.com/networked-aframe/networked-aframe",
+ "networked-aframe": "https://github.com/mozillareality/networked-aframe#mr-social-client/master",
"nipplejs": "^0.6.7",
"query-string": "^5.0.1",
"raven-js": "^3.20.1",
diff --git a/src/components/networked-counter.js b/src/components/networked-counter.js
index 41aa1878a..8c4f59de8 100644
--- a/src/components/networked-counter.js
+++ b/src/components/networked-counter.js
@@ -31,7 +31,7 @@ AFRAME.registerComponent("networked-counter", {
return;
}
- const id = this._getNetworkId(networkedEl);
+ const id = NAF.utils.getNetworkId(networkedEl);
if (id && this.queue.hasOwnProperty(id)) {
return;
}
@@ -60,7 +60,7 @@ AFRAME.registerComponent("networked-counter", {
},
deregister: function(networkedEl) {
- const id = this._getNetworkId(networkedEl);
+ const id = NAF.utils.getNetworkId(networkedEl);
if (id && this.queue.hasOwnProperty(id)) {
const item = this.queue[id];
networkedEl.removeEventListener(this.data.grab_event, item.onGrabHandler);
@@ -126,12 +126,5 @@ 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;
- }
+ }
});
diff --git a/yarn.lock b/yarn.lock
index 3700485cc..41b0864f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5249,9 +5249,9 @@ neo-async@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
-"networked-aframe@https://github.com/networked-aframe/networked-aframe":
- version "0.6.0"
- resolved "https://github.com/networked-aframe/networked-aframe#be5b2e949ec63fc44a1c6ab40b627cee5fda057e"
+"networked-aframe@https://github.com/mozillareality/networked-aframe#mr-social-client/master":
+ version "0.5.1"
+ resolved "https://github.com/mozillareality/networked-aframe#5d2f50ddf65140f0ae671b2b53c1c667de18dca5"
dependencies:
aframe-lerp-component "^1.1.0"
easyrtc "1.1.0"
--
GitLab