VREffect and VRControls: Catch error retreiving VR Displays (mrdoob#9825)

brianchirls · mrdoob · commit 56a96d88807a · 2016-10-06T23:59:26.000-04:00
This can happen if the page is inside an iframe that doesn't have an `allowvr` attribute set or if permission is otherwise denied.
diff --git a/examples/js/controls/VRControls.js b/examples/js/controls/VRControls.js
@@ -37,7 +37,11 @@ THREE.VRControls = function ( object, onError ) {
 
 	if ( navigator.getVRDisplays ) {
 
-		navigator.getVRDisplays().then( gotVRDisplays );
+		navigator.getVRDisplays().then( gotVRDisplays ).catch ( function () {
+
+			console.warn( 'THREE.VRControls: Unable to get VR Displays' );
+
+		} );
 
 	}
 
diff --git a/examples/js/effects/VREffect.js b/examples/js/effects/VREffect.js
@@ -42,7 +42,11 @@ THREE.VREffect = function ( renderer, onError ) {
 
 	if ( navigator.getVRDisplays ) {
 
-		navigator.getVRDisplays().then( gotVRDisplays );
+		navigator.getVRDisplays().then( gotVRDisplays ).catch ( function () {
+
+			console.warn( 'THREE.VREffect: Unable to get VR Displays' );
+
+		} );
 
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,11 @@ THREE.VRControls = function ( object, onError ) {`
`37`	`37`
`38`	`38`	`if ( navigator.getVRDisplays ) {`
`39`	`39`
`40`		`- navigator.getVRDisplays().then( gotVRDisplays );`
	`40`	`+ navigator.getVRDisplays().then( gotVRDisplays ).catch ( function () {`
	`41`	`+`
	`42`	`+ console.warn( 'THREE.VRControls: Unable to get VR Displays' );`
	`43`	`+`
	`44`	`+ } );`
`41`	`45`
`42`	`46`	`}`
`43`	`47`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,11 @@ THREE.VREffect = function ( renderer, onError ) {`
`42`	`42`
`43`	`43`	`if ( navigator.getVRDisplays ) {`
`44`	`44`
`45`		`- navigator.getVRDisplays().then( gotVRDisplays );`
	`45`	`+ navigator.getVRDisplays().then( gotVRDisplays ).catch ( function () {`
	`46`	`+`
	`47`	`+ console.warn( 'THREE.VREffect: Unable to get VR Displays' );`
	`48`	`+`
	`49`	`+ } );`
`46`	`50`
`47`	`51`	`}`
`48`	`52`