Bladeren bron

do not use xmpp module in AudioLevels

master
isymchych 10 jaren geleden
bovenliggende
commit
c21c9ce1b8
3 gewijzigde bestanden met toevoegingen van 15 en 6 verwijderingen
  1. 8
    0
      app.js
  2. 6
    4
      modules/UI/audio_levels/AudioLevels.js
  3. 1
    2
      modules/UI/toolbars/ToolbarToggler.js

+ 8
- 0
app.js Bestand weergeven

37
         setNickname: function (nickname) {
37
         setNickname: function (nickname) {
38
             // FIXME check if room is available etc.
38
             // FIXME check if room is available etc.
39
             room.setDisplayName(nickname);
39
             room.setDisplayName(nickname);
40
+        },
41
+
42
+        isModerator: function () {
43
+            return false;
44
+        },
45
+
46
+        myJid: function () {
47
+            return room.myUserId();
40
         }
48
         }
41
     };
49
     };
42
 }
50
 }

+ 6
- 4
modules/UI/audio_levels/AudioLevels.js Bestand weergeven

109
         drawContext.drawImage(canvasCache, 0, 0);
109
         drawContext.drawImage(canvasCache, 0, 0);
110
 
110
 
111
         if(resourceJid === AudioLevels.LOCAL_LEVEL) {
111
         if(resourceJid === AudioLevels.LOCAL_LEVEL) {
112
-            if(!APP.xmpp.myJid()) {
112
+            resourceJid = APP.conference.localId();
113
+            if (!resourceJid) {
113
                 return;
114
                 return;
114
             }
115
             }
115
-            resourceJid = APP.xmpp.myResource();
116
         }
116
         }
117
 
117
 
118
         if(resourceJid === largeVideoResourceJid) {
118
         if(resourceJid === largeVideoResourceJid) {
224
     function getVideoSpanId(resourceJid) {
224
     function getVideoSpanId(resourceJid) {
225
         var videoSpanId = null;
225
         var videoSpanId = null;
226
         if (resourceJid === AudioLevels.LOCAL_LEVEL ||
226
         if (resourceJid === AudioLevels.LOCAL_LEVEL ||
227
-            (APP.xmpp.myResource() && resourceJid === APP.xmpp.myResource()))
227
+            (APP.conference.localId() && resourceJid === APP.conference.localId())) {
228
             videoSpanId = 'localVideoContainer';
228
             videoSpanId = 'localVideoContainer';
229
-        else
229
+        }
230
+        else {
230
             videoSpanId = 'participant_' + resourceJid;
231
             videoSpanId = 'participant_' + resourceJid;
232
+        }
231
 
233
 
232
         return videoSpanId;
234
         return videoSpanId;
233
     }
235
     }

+ 1
- 2
modules/UI/toolbars/ToolbarToggler.js Bestand weergeven

75
             toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT;
75
             toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT;
76
         }
76
         }
77
 
77
 
78
-        if (APP.xmpp.isModerator())
79
-        {
78
+        if (APP.conference.isModerator()) {
80
 //            TODO: Enable settings functionality.
79
 //            TODO: Enable settings functionality.
81
 //                  Need to uncomment the settings button in index.html.
80
 //                  Need to uncomment the settings button in index.html.
82
 //            $('#settingsButton').css({visibility:"visible"});
81
 //            $('#settingsButton').css({visibility:"visible"});

Laden…
Annuleren
Opslaan