FS-7509: try to make full screen mode universal

diff --git a/html5/verto/video_demo/index.html b/html5/verto/video_demo/index.html
index 12dcd026c1c22b5d40d4155451229b9e7ad843f7..3f558fe419983dc8049f57545387feecd9556a73 100644 (file)
--- a/html5/verto/video_demo/index.html
+++ b/html5/verto/video_demo/index.html
@@ -94,11 +94,11 @@
 
 
 
-<div id="fs" style="width:100%;height:100%">
+<div id="fs" xstyle="width:100%;height:100%">
 <div id="rows" style="background-color:#f9f9f9">
 
 <span id=usrinner style="margin:25px">
-  <span id=usrctl>User Controls</span>
+  <span id=usrctl><b>User Controls</b></span>
       <div id=usr2>
 
       <button data-inline="true" id="hold">HOLD</button>
@@ -120,7 +120,7 @@
              </span>
 
 <br><br>
-      <div id="conf" style="width:100%;height:100%">
+      <div id="conf" xstyle="width:100%;height:100%">
        <div style="color:black;font-family: verdana" align="center" id="conf_count"></div><br>
        <table width="1000" cellspacing="0" cellpadding="0" border="0" align="center" id="conf_list" class="jsDataTable">
        </table>

diff --git a/html5/verto/video_demo/verto.js b/html5/verto/video_demo/verto.js
index c4b488f623f6319307ff4e6df97e2f540dd4a6bd..302199694b5d0726191f1f7d9434d69aa276bd4f 100644 (file)
--- a/html5/verto/video_demo/verto.js
+++ b/html5/verto/video_demo/verto.js
@@ -519,18 +519,30 @@ $("#vmutebtn").click(function() {
 
 var is_full = false;
 var usrto;
+var rs;
 function noop() { return; }
 
 function on_full(which)
 {
     is_full = which;
     if (is_full) {
+       clearTimeout(rs);
+       $("#usr2").hide();
+       rs = setTimeout(function() {
+           $("#webcam").width($(window).width());
+           $("#webcam").height($(window).height());
+       }, 1500);
        $("#rows").css("position", "absolute").css("z-index", "2");    
        $("#fullbtn").text("Exit Full Screen");
     } else {
        $("#rows").css("position", "static").css("z-index", "2");
        $("#fullbtn").text("Enter Full Screen");
-       clearTimeout(usrto);    
+       clearTimeout(usrto);
+       clearTimeout(rs);
+       rs = setTimeout(function() { 
+           $("#webcam").width("100%");
+           $("#webcam").height("100%");
+       }, 1500);
     }
 
 }
@@ -1226,12 +1238,10 @@ $(document).ready(function() {
     $("#usr2").hide();
 
     $("#usrctl").mouseover(function() {
-       $("#mod2").hide();
        $("#usr2").show();
     });
 
     $("#usr2").mouseover(function() {
-       $("#mod2").hide();
        clearTimeout(usrto);
     });