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

Merging fippo's changes concerning toolbar icons size. Makes toolbar appear once we've joined.

This commit is contained in:
Yana Stamcheva 2013-12-18 15:33:51 +01:00
parent 3d25294354
commit dbe90232d0
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app.js
View File

@ -162,6 +162,10 @@ $(document).bind('callterminated.jingle', function (event, sid, reason) {
$(document).bind('joined.muc', function (event, jid, info) { $(document).bind('joined.muc', function (event, jid, info) {
console.log('onJoinComplete', info); console.log('onJoinComplete', info);
updateRoomUrl(window.location.href); updateRoomUrl(window.location.href);
// Once we've joined the muc show the toolbar
showToolbar();
if (Object.keys(connection.emuc.members).length < 1) { if (Object.keys(connection.emuc.members).length < 1) {
focus = new ColibriFocus(connection, config.hosts.bridge); focus = new ColibriFocus(connection, config.hosts.bridge);
return; return;
@ -171,6 +175,7 @@ $(document).bind('joined.muc', function (event, jid, info) {
$(document).bind('entered.muc', function (event, jid, info) { $(document).bind('entered.muc', function (event, jid, info) {
console.log('entered', jid, info); console.log('entered', jid, info);
console.log(focus); console.log(focus);
if (focus !== null) { if (focus !== null) {
// FIXME: this should prepare the video // FIXME: this should prepare the video
if (focus.confid === null) { if (focus.confid === null) {
@ -422,6 +427,10 @@ function openChat() {
$('#usermsg').focus(); $('#usermsg').focus();
} }
function showToolbar() {
$('#toolbar').css({visibility:"visible"});
}
function updateRoomUrl(newRoomUrl) { function updateRoomUrl(newRoomUrl) {
roomUrl = newRoomUrl; roomUrl = newRoomUrl;
} }

8
config.js
View File

@ -1,9 +1,9 @@
var config = { var config = {
hosts: { hosts: {
domain: 'your.domain.example', domain: 'lambada.jitsi.net',
muc: 'conference.your.domain.example', // FIXME: use XEP-0030 muc: 'conference.lambada.jitsi.net', // FIXME: use XEP-0030
bridge: 'jitsi-videobridge.your.domain.example' // FIXME: use XEP-0030 bridge: 'jitsi-videobridge.lambada.jitsi.net' // FIXME: use XEP-0030
}, },
useNicks: false, useNicks: false,
bosh: '/http-bind' // FIXME: use xep-0156 for that bosh: '//lambada.jitsi.net/http-bind' // FIXME: use xep-0156 for that
}; };

3
css/main.css
View File

@ -172,13 +172,14 @@ html, body{
z-index:1; z-index:1;
} }
#link { #toolbar {
display:block; display:block;
position:relative; position:relative;
height:39px; height:39px;
width:auto; width:auto;
overflow: hidden; overflow: hidden;
z-index:0; z-index:0;
visibility: hidden;
} }
.button { .button {

2
index.html
View File

@ -18,7 +18,7 @@
<div id="header"> <div id="header">
<a href="http://jitsi.org" target="_blank"><div id="leftlogo"></div></a> <a href="http://jitsi.org" target="_blank"><div id="leftlogo"></div></a>
<a href="http://www.estos.com/" target="_blank"><div id="rightlogo"></div></a> <a href="http://www.estos.com/" target="_blank"><div id="rightlogo"></div></a>
<div id="link"> <div id="toolbar">
<a class="button" onclick='buttonClick("#mute", "fa fa-microphone fa-lg fa fa-microphone-slash fa-lg");toggleAudio();'><i id="mute" title="Mute / unmute" class="fa fa-microphone fa-lg"></i></a> <a class="button" onclick='buttonClick("#mute", "fa fa-microphone fa-lg fa fa-microphone-slash fa-lg");toggleAudio();'><i id="mute" title="Mute / unmute" class="fa fa-microphone fa-lg"></i></a>
<div class="header_button_separator"></div> <div class="header_button_separator"></div>
<a class="button" onclick='buttonClick("#video", "fa fa-video-camera fa-lg fa fa-video-camera no-fa-video-camera fa-lg");toggleVideo();'><i id="video" title="Start / stop camera" class="fa fa-video-camera fa-lg"></i></a> <a class="button" onclick='buttonClick("#video", "fa fa-video-camera fa-lg fa fa-video-camera no-fa-video-camera fa-lg");toggleVideo();'><i id="video" title="Start / stop camera" class="fa fa-video-camera fa-lg"></i></a>