From ba6c73cc9f2bb49b49408cba267699f8f380c669 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Tue, 16 Oct 2018 00:39:34 +0000
Subject: [PATCH] Hide headset link on phones, use entry code based hub.link in
HUD
---
src/hub.js | 2 +-
src/react-components/link-root.js | 25 ++++++++++++++-----------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/hub.js b/src/hub.js
index 1e0af568b..dc9ab1bdc 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -263,7 +263,7 @@ async function handleHubChannelJoined(entryManager, hubChannel, data) {
document
.querySelector("#hud-hub-entry-link")
- .setAttribute("text", { value: `hub.link/${hub.hub_id}`, width: 1.1, align: "center" });
+ .setAttribute("text", { value: `hub.link/${hub.entry_code}`, width: 1.1, align: "center" });
scene.setAttribute("networked-scene", {
room: hub.hub_id,
diff --git a/src/react-components/link-root.js b/src/react-components/link-root.js
index be652f7b1..e06442749 100644
--- a/src/react-components/link-root.js
+++ b/src/react-components/link-root.js
@@ -249,17 +249,20 @@ class LinkRoot extends Component {
</div>
<div className={styles.footer}>
- <div
- className={styles.linkHeadsetFooterLink}
- style={{ visibility: this.state.isAlphaMode ? "hidden" : "visible" }}
- >
- <img onClick={() => this.toggleMode()} src={HeadsetIcon} className={styles.headsetIcon} />
- <span>
- <a href="#" onClick={() => this.toggleMode()}>
- <FormattedMessage id="link.linking_a_headset" />
- </a>
- </span>
- </div>
+ {!this.state.isAlphaMode &&
+ this.props.showHeadsetLinkOption && (
+ <div
+ className={styles.linkHeadsetFooterLink}
+ style={{ visibility: this.state.isAlphaMode ? "hidden" : "visible" }}
+ >
+ <img onClick={() => this.toggleMode()} src={HeadsetIcon} className={styles.headsetIcon} />
+ <span>
+ <a href="#" onClick={() => this.toggleMode()}>
+ <FormattedMessage id="link.linking_a_headset" />
+ </a>
+ </span>
+ </div>
+ )}
</div>
</div>
</div>
--
GitLab