Check exitVR property of keyboard-shortcuts to enable Escape shortcut (…

…#5512) Co-authored-by: Noeri Huisman <[email protected]>
aframevr · Nov 9, 2024 · d112009 · d112009
1 parent 7b8a308
commit d112009
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/docs/components/keyboard-shortcuts.md b/docs/components/keyboard-shortcuts.md
@@ -14,11 +14,12 @@ keyboard-shortcuts component applies only to the [`<a-scene>` element][scene].
 ## Example
 
 ```html
-<a-scene keyboard-shortcuts="enterVR: false"></a-scene>
+<a-scene keyboard-shortcuts="enterVR: false; exitVR: false;"></a-scene>
 ```
 
 ## Properties
 
 | Property    | Description                                           | Default Value |
 |-------------|-------------------------------------------------------|---------------|
 | enterVR     | Enables the shortcut to press 'F' to enter VR.        | true          |
+| exitVR      | Enables the shortcut to press 'Escape' to exit VR.    | true          |
diff --git a/src/components/scene/keyboard-shortcuts.js b/src/components/scene/keyboard-shortcuts.js
@@ -13,11 +13,6 @@ module.exports.Component = registerComponent('keyboard-shortcuts', {
     this.onKeyup = this.onKeyup.bind(this);
   },
 
-  update: function (oldData) {
-    var data = this.data;
-    this.enterVREnabled = data.enterVR;
-  },
-
   play: function () {
     window.addEventListener('keyup', this.onKeyup, false);
   },
@@ -29,10 +24,10 @@ module.exports.Component = registerComponent('keyboard-shortcuts', {
   onKeyup: function (evt) {
     var scene = this.el;
     if (!shouldCaptureKeyEvent(evt)) { return; }
-    if (this.enterVREnabled && evt.keyCode === 70) {  // f.
+    if (this.data.enterVR && evt.keyCode === 70) {  // f.
       scene.enterVR();
     }
-    if (this.enterVREnabled && evt.keyCode === 27) {  // escape.
+    if (this.data.exitVR && evt.keyCode === 27) {   // escape.
       scene.exitVR();
     }
   }