Skip to content

Exit fullscreen when on ExitVR() #2264

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

Merged
merged 1 commit into from
Jan 10, 2017
Merged

Exit fullscreen when on ExitVR() #2264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/core/scene/a-scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ module.exports = registerElement('a-scene', {
// Don't exit VR if not in VR.
if (!this.is('vr-mode')) { return Promise.resolve('Not in VR.'); }

exitFullscreen();
Copy link
Member

@ngokevin ngokevin Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should call this after the not-in-VR check below
Copy link
Member

@dmarcos dmarcos Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it won't work. Just entering fullscreen does not set the state to vr-mode
Copy link
Member

@ngokevin ngokevin Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/fernandojsg/aframe/blob/5eb5df7ccdacde78223bc2c914f010277508b4b3/src/core/scene/a-scene.js#L156
Copy link
Member Author

@fernandojsg fernandojsg Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep

if (this.checkHeadsetConnected() || this.isMobile) {
return this.effect.exitPresent().then(exitVRSuccess, exitVRFailure);
}
Expand Down Expand Up @@ -489,3 +491,13 @@ function requestFullscreen (canvas) {
canvas.msRequestFullscreen;
requestFullscreen.apply(canvas);
}

function exitFullscreen () {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
}