From 43de3e14eb79d6b3598261a01b9ecba42bcdd68b Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 5 Mar 2015 13:06:36 -0600 Subject: [PATCH] FS-7509: try to make full screen mode universal --- html5/verto/video_demo/index.html | 6 +++--- html5/verto/video_demo/verto.js | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/html5/verto/video_demo/index.html b/html5/verto/video_demo/index.html index 12dcd026c1..3f558fe419 100644 --- a/html5/verto/video_demo/index.html +++ b/html5/verto/video_demo/index.html @@ -94,11 +94,11 @@ -
+
- User Controls + User Controls
@@ -120,7 +120,7 @@

-
+

diff --git a/html5/verto/video_demo/verto.js b/html5/verto/video_demo/verto.js index c4b488f623..302199694b 100644 --- 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); });