kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7509: try to make full screen mode universal

This commit is contained in:
Anthony Minessale 2015-03-05 13:06:36 -06:00 committed by Michael Jerris
parent 43eb323631
commit 43de3e14eb
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
html5/verto/video_demo/index.html
View File

@ -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"> <div id="rows" style="background-color:#f9f9f9">
<span id=usrinner style="margin:25px"> <span id=usrinner style="margin:25px">
<span id=usrctl>User Controls</span> <span id=usrctl><b>User Controls</b></span>
<div id=usr2> <div id=usr2>
<button data-inline="true" id="hold">HOLD</button> <button data-inline="true" id="hold">HOLD</button>
@ -120,7 +120,7 @@
</span> </span>
<br><br> <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> <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 width="1000" cellspacing="0" cellpadding="0" border="0" align="center" id="conf_list" class="jsDataTable">
</table> </table>

14
html5/verto/video_demo/verto.js
View File

@ -519,18 +519,30 @@ $("#vmutebtn").click(function() {
var is_full = false; var is_full = false;
var usrto; var usrto;
var rs;
function noop() { return; } function noop() { return; }
function on_full(which) function on_full(which)
{ {
is_full = which; is_full = which;
if (is_full) { 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"); $("#rows").css("position", "absolute").css("z-index", "2");
$("#fullbtn").text("Exit Full Screen"); $("#fullbtn").text("Exit Full Screen");
} else { } else {
$("#rows").css("position", "static").css("z-index", "2"); $("#rows").css("position", "static").css("z-index", "2");
$("#fullbtn").text("Enter Full Screen"); $("#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(); $("#usr2").hide();
$("#usrctl").mouseover(function() { $("#usrctl").mouseover(function() {
$("#mod2").hide();
$("#usr2").show(); $("#usr2").show();
}); });
$("#usr2").mouseover(function() { $("#usr2").mouseover(function() {
$("#mod2").hide();
clearTimeout(usrto); clearTimeout(usrto);
}); });