From d3f25321728d4c65d9170049431432e82c9ce1e4 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Fri, 3 Jan 2014 17:41:50 +0100 Subject: [PATCH] Integrates fippo's work on audio only for firefox and other fixes. --- app.js | 12 +- css/main.css | 9 ++ index.html | 8 +- libs/colibri.js | 121 +++++++++++------ libs/strophejingle.bundle.js | 249 +++++++++++++++++------------------ muc.js | 1 + 6 files changed, 222 insertions(+), 178 deletions(-) diff --git a/app.js b/app.js index ced421b91..4bb34bf6a 100644 --- a/app.js +++ b/app.js @@ -382,7 +382,8 @@ $(window).bind('beforeunload', function () { } }); -function dump(elem, filename){ +function dump(elem, filename) { + console.log("ELEMENT", elem); elem = elem.parentNode; elem.download = filename || 'xmpplog.json'; elem.href = 'data:application/json;charset=utf-8,\n'; @@ -487,7 +488,7 @@ function openLockDialog() { if(v) { setSharedKey(''); - lockRoom(); + lockRoom(false); } } }); @@ -508,7 +509,6 @@ function openLockDialog() { if (lockKey.value) { - console.log("LOCK KEY", lockKey.value); setSharedKey(lockKey.value); lockRoom(true); } @@ -537,7 +537,11 @@ function openLinkDialog() { * Locks / unlocks the room. */ function lockRoom(lock) { - connection.emuc.lockRoom(sharedKey); + console.log("LOCK", sharedKey); + if (lock) + connection.emuc.lockRoom(sharedKey); + else + connection.emuc.lockRoom(''); updateLockButton(); } diff --git a/css/main.css b/css/main.css index ff7782ac9..f3f4868ad 100644 --- a/css/main.css +++ b/css/main.css @@ -326,3 +326,12 @@ form { -moz-transition: height 0.2s; transition: height 0.2s; } + +#downloadlog { + position: absolute; + bottom: 5; + left: 5; + overflow: visible; + z-index: 100; +} + diff --git a/index.html b/index.html index 3cb3a1e35..08ce3cd18 100644 --- a/index.html +++ b/index.html @@ -2,13 +2,13 @@ WebRTC, meet the Jitsi Videobridge - - + + - + @@ -65,7 +65,7 @@
- +