Merging fippo's changes concerning toolbar icons size. Makes toolbar appear once we've joined.
This commit is contained in:
parent
3d25294354
commit
dbe90232d0
9
app.js
9
app.js
|
@ -162,6 +162,10 @@ $(document).bind('callterminated.jingle', function (event, sid, reason) {
|
|||
$(document).bind('joined.muc', function (event, jid, info) {
|
||||
console.log('onJoinComplete', info);
|
||||
updateRoomUrl(window.location.href);
|
||||
|
||||
// Once we've joined the muc show the toolbar
|
||||
showToolbar();
|
||||
|
||||
if (Object.keys(connection.emuc.members).length < 1) {
|
||||
focus = new ColibriFocus(connection, config.hosts.bridge);
|
||||
return;
|
||||
|
@ -171,6 +175,7 @@ $(document).bind('joined.muc', function (event, jid, info) {
|
|||
$(document).bind('entered.muc', function (event, jid, info) {
|
||||
console.log('entered', jid, info);
|
||||
console.log(focus);
|
||||
|
||||
if (focus !== null) {
|
||||
// FIXME: this should prepare the video
|
||||
if (focus.confid === null) {
|
||||
|
@ -422,6 +427,10 @@ function openChat() {
|
|||
$('#usermsg').focus();
|
||||
}
|
||||
|
||||
function showToolbar() {
|
||||
$('#toolbar').css({visibility:"visible"});
|
||||
}
|
||||
|
||||
function updateRoomUrl(newRoomUrl) {
|
||||
roomUrl = newRoomUrl;
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
var config = {
|
||||
hosts: {
|
||||
domain: 'your.domain.example',
|
||||
muc: 'conference.your.domain.example', // FIXME: use XEP-0030
|
||||
bridge: 'jitsi-videobridge.your.domain.example' // FIXME: use XEP-0030
|
||||
domain: 'lambada.jitsi.net',
|
||||
muc: 'conference.lambada.jitsi.net', // FIXME: use XEP-0030
|
||||
bridge: 'jitsi-videobridge.lambada.jitsi.net' // FIXME: use XEP-0030
|
||||
},
|
||||
useNicks: false,
|
||||
bosh: '/http-bind' // FIXME: use xep-0156 for that
|
||||
bosh: '//lambada.jitsi.net/http-bind' // FIXME: use xep-0156 for that
|
||||
};
|
||||
|
|
|
@ -172,13 +172,14 @@ html, body{
|
|||
z-index:1;
|
||||
}
|
||||
|
||||
#link {
|
||||
#toolbar {
|
||||
display:block;
|
||||
position:relative;
|
||||
height:39px;
|
||||
width:auto;
|
||||
overflow: hidden;
|
||||
z-index:0;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.button {
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
<div id="header">
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
|
|
Loading…
Reference in New Issue