repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 88d4d650ec614a42a715b10391568521bd2bb193:
path_to: 
revision_to: 

commit 88d4d650ec614a42a715b10391568521bd2bb193
Author: James Baicoianu 
Date:   Fri Jul 26 08:15:16 2019 -0700

    Button styling updates

diff --git a/media/assets/webui/apps/buttons/buttons.css b/media/assets/webui/apps/buttons/buttons.css

--- a/media/assets/webui/apps/buttons/buttons.css
+++ b/media/assets/webui/apps/buttons/buttons.css
@@ -25,3 +25,19 @@ janus-button-webvr[disabled] {
   cursor: not-allowed;
 }

+janus-ui-buttons>ui-buttonbar>ui-button,
+janus-ui-buttons>ui-buttonbar>ui-button:first-of-type,
+janus-ui-buttons>ui-buttonbar>ui-button:last-of-type,
+janus-ui-buttons>ui-buttonbar>janus-button-webvr,
+janus-ui-buttons>ui-buttonbar>janus-ui-settings-button {
+    width: 60px;
+    height: 40px;
+    border-radius: 30px;
+    border: 1px solid white;
+    display: block;
+    margin: 0 .2em;
+    padding: 0;
+    line-height: 38px;
+    font-size: .8em;
+    font-weight: bold;
+}
diff --git a/media/assets/webui/apps/buttons/buttons.js b/media/assets/webui/apps/buttons/buttons.js

--- a/media/assets/webui/apps/buttons/buttons.js
+++ b/media/assets/webui/apps/buttons/buttons.js
@@ -54,7 +54,10 @@ elation.elements.define('janus-button-fullscreen', class extends elation.element
 });
 elation.elements.define('janus-button-webvr', class extends elation.elements.ui.togglebutton {
   create() {
-    this.label = 'Enter WebVR';
+    this.activelabel = 'WebVR';
+    this.inactivelabel = 'WebVR';
+
+    this.label = this.activelabel;
     super.create();
     this.view = janus.engine.client.view;

@@ -70,14 +73,19 @@ elation.elements.define('janus-button-webvr', class extends elation.elements.ui.

     }, false );

+    window.addEventListener( 'vrdisplaypresentchange', (ev) => {

+      if (this.view.vrdisplay.isPresenting) {
+      } else {
+      }
+    }, false );
   }
   onactivate(ev) {
-    this.label = 'Exit WebVR';
+    this.label = this.activelabel;
     this.view.toggleVR(true);
   }
   ondeactivate(ev) {
-    this.label = 'Enter WebVR';
+    this.label = this.inactivelabel;
     this.view.toggleVR(false);
   }
 });

-----END OF PAGE-----