Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix adapter and fileId errors #804

Merged
merged 8 commits into from
Dec 31, 2018
Merged

Fix adapter and fileId errors #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d85513d
fix `TypeError: Cannot read property enableMicrophone of undefined` e…
cvan May 17, 2018
509a2b7
handle `toggleFreeze` error, etc.
cvan May 21, 2018
5abf8b7
remove unneeded checks for `NAF.connection`
cvan May 21, 2018
ce61f26
remove `NAF.connection.*` checks in `block-button` component
cvan May 21, 2018
0eb4be4
address review feedback (thanks, @brianpeiris!)
cvan May 21, 2018
44616c2
Merge branch 'master' of github.com:mozilla/hubs into fix-enableMicro…
brianpeiris Dec 27, 2018
7f155e9
Simplify adapter check. Don't indicate success if muting fails
brianpeiris Dec 27, 2018
edfd080
Fix fileId error on ducks
brianpeiris Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/freeze-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ AFRAME.registerComponent("freeze-controller", {

onToggle: function() {
window.APP.store.update({ activity: { hasFoundFreeze: true } });
if (!NAF.connection.adapter) return;
NAF.connection.adapter.toggleFreeze();
if (NAF.connection.adapter.frozen) {
this.el.emit("play_freeze_sound");
Expand Down
2 changes: 2 additions & 0 deletions src/components/mute-mic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ AFRAME.registerComponent("mute-mic", {
},

onToggle: function() {
if (!NAF.connection.adapter) return;
if (this.el.is("muted")) {
NAF.connection.adapter.enableMicrophone(true);
this.el.removeState("muted");
Expand All @@ -60,6 +61,7 @@ AFRAME.registerComponent("mute-mic", {
},

onMute: function() {
if (!NAF.connection.adapter) return;
if (!this.el.is("muted")) {
NAF.connection.adapter.enableMicrophone(false);
this.el.addState("muted");
Expand Down
3 changes: 2 additions & 1 deletion src/scene-entry-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ export default class SceneEntryManager {
const networkId = components.networked.data.networkId;
el.setAttribute("networked", { persistent: false });

const { fileId } = el.components["media-loader"].data;
const mediaLoader = components["media-loader"];
const fileId = mediaLoader.data && mediaLoader.data.fileId;

this.hubChannel.unpin(networkId, fileId);
});
Expand Down