haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes webkit fullscreen checker flag

This commit is contained in:
Emil Ivov 2014-02-09 13:03:24 +01:00
parent ac51a90f6c
commit 7ecb5f7962
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -1119,13 +1119,12 @@ function scrollChatToBottom() {
function toggleFullScreen() { function toggleFullScreen() {
var fsElement = document.documentElement; var fsElement = document.documentElement;
if (!document.mozFullScreen && !document.webkitFullScreen){ if (!document.mozFullScreen && !document.webkitIsFullScreen){
//Enter Full Screen //Enter Full Screen
if (fsElement.mozRequestFullScreen) { if (fsElement.mozRequestFullScreen) {
fsElement.mozRequestFullScreen(); fsElement.mozRequestFullScreen();
} }
else { else {
fsElement.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT); fsElement.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
@ -1138,6 +1137,7 @@ function toggleFullScreen() {
document.mozCancelFullScreen(); document.mozCancelFullScreen();
} else { } else {
document.webkitCancelFullScreen(); document.webkitCancelFullScreen();
document.webkitCancelFullScreen();
} }
} }
} }

4
index.html
View File

@ -7,7 +7,7 @@
<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script> <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
<script src="muc.js?v=4"></script><!-- simple MUC library --> <script src="muc.js?v=4"></script><!-- simple MUC library -->
<script src="estos_log.js?v=2"></script><!-- simple stanza logger --> <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
<script src="app.js?v=16"></script><!-- application logic --> <script src="app.js?v=17"></script><!-- application logic -->
<script src="smileys.js?v=1"></script><!-- smiley images --> <script src="smileys.js?v=1"></script><!-- smiley images -->
<script src="replacement.js?v=5"></script><!-- link and smiley replacement --> <script src="replacement.js?v=5"></script><!-- link and smiley replacement -->
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
@ -36,7 +36,7 @@
<div class="header_button_separator"></div> <div class="header_button_separator"></div>
<a class="button" onclick='openPreziDialog();'><i title="Share prezi" class="fa fa-desktop fa-lg"></i></a> <a class="button" onclick='openPreziDialog();'><i title="Share prezi" class="fa fa-desktop fa-lg"></i></a>
<div class="header_button_separator"></div> <div class="header_button_separator"></div>
<a class="button" onclick='toggleFullScreen();'><i title="Enter / Exit Full Screen" class="icon-fullscreen"></i></a> <a class="button" onclick='toggleFullScreen();'><i title="Enter / Exit Full Screen" class="fa fa-arrows-alt"></i></a>
<!--span id="settingsButton"> <!--span id="settingsButton">
<div class="header_button_separator"></div> <div class="header_button_separator"></div>
<a class="button" onclick='openSettingsDialog();'><i title="Settings" class="fa fa-cog fa-lg"></i></a> <a class="button" onclick='openSettingsDialog();'><i title="Settings" class="fa fa-cog fa-lg"></i></a>