Browse Source

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

master
Yana Stamcheva 11 years ago
parent
commit
dbe90232d0
4 changed files with 16 additions and 6 deletions
  1. 9
    0
      app.js
  2. 4
    4
      config.js
  3. 2
    1
      css/main.css
  4. 1
    1
      index.html

+ 9
- 0
app.js View File

162
 $(document).bind('joined.muc', function (event, jid, info) {
162
 $(document).bind('joined.muc', function (event, jid, info) {
163
     console.log('onJoinComplete', info);
163
     console.log('onJoinComplete', info);
164
     updateRoomUrl(window.location.href);
164
     updateRoomUrl(window.location.href);
165
+
166
+    // Once we've joined the muc show the toolbar
167
+    showToolbar();
168
+
165
     if (Object.keys(connection.emuc.members).length < 1) {
169
     if (Object.keys(connection.emuc.members).length < 1) {
166
         focus = new ColibriFocus(connection, config.hosts.bridge);
170
         focus = new ColibriFocus(connection, config.hosts.bridge);
167
         return;
171
         return;
171
 $(document).bind('entered.muc', function (event, jid, info) {
175
 $(document).bind('entered.muc', function (event, jid, info) {
172
     console.log('entered', jid, info);
176
     console.log('entered', jid, info);
173
     console.log(focus);
177
     console.log(focus);
178
+
174
     if (focus !== null) {
179
     if (focus !== null) {
175
         // FIXME: this should prepare the video
180
         // FIXME: this should prepare the video
176
         if (focus.confid === null) {
181
         if (focus.confid === null) {
422
         $('#usermsg').focus();
427
         $('#usermsg').focus();
423
 }
428
 }
424
 
429
 
430
+function showToolbar() {
431
+    $('#toolbar').css({visibility:"visible"});
432
+}
433
+
425
 function updateRoomUrl(newRoomUrl) {
434
 function updateRoomUrl(newRoomUrl) {
426
     roomUrl = newRoomUrl;
435
     roomUrl = newRoomUrl;
427
 }
436
 }

+ 4
- 4
config.js View File

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

+ 2
- 1
css/main.css View File

172
     z-index:1;
172
     z-index:1;
173
 }
173
 }
174
 
174
 
175
-#link {
175
+#toolbar {
176
     display:block;
176
     display:block;
177
     position:relative;
177
     position:relative;
178
     height:39px;
178
     height:39px;
179
     width:auto;
179
     width:auto;
180
     overflow: hidden;
180
     overflow: hidden;
181
     z-index:0;
181
     z-index:0;
182
+    visibility: hidden;
182
 }
183
 }
183
 
184
 
184
 .button {
185
 .button {

+ 1
- 1
index.html View File

18
     <div id="header">
18
     <div id="header">
19
         <a href="http://jitsi.org" target="_blank"><div id="leftlogo"></div></a>
19
         <a href="http://jitsi.org" target="_blank"><div id="leftlogo"></div></a>
20
         <a href="http://www.estos.com/" target="_blank"><div id="rightlogo"></div></a>
20
         <a href="http://www.estos.com/" target="_blank"><div id="rightlogo"></div></a>
21
-        <div id="link">
21
+        <div id="toolbar">
22
             <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>
22
             <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>
23
             <div class="header_button_separator"></div>
23
             <div class="header_button_separator"></div>
24
             <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>
24
             <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…
Cancel
Save