Browse Source

Merge pull request #933 from jitsi/fix-everyone-moderator

Fixes moderator related elements when everyone is moderator
master
Дамян Минков 9 years ago
parent
commit
c437f64f35
3 changed files with 6 additions and 6 deletions
  1. 0
    1
      index.html
  2. 3
    3
      modules/UI/UI.js
  3. 3
    2
      modules/UI/videolayout/VideoLayout.js

+ 0
- 1
index.html View File

245
                         <!--<video id="localVideo" autoplay muted></video> - is now per stream generated -->
245
                         <!--<video id="localVideo" autoplay muted></video> - is now per stream generated -->
246
                     </span>
246
                     </span>
247
                     <audio id="localAudio" autoplay muted></audio>
247
                     <audio id="localAudio" autoplay muted></audio>
248
-                    <span class="focusindicator"></span>
249
                     <div class="videocontainer__toolbar"></div>
248
                     <div class="videocontainer__toolbar"></div>
250
                 </span>
249
                 </span>
251
                 <audio id="userJoined" src="sounds/joined.wav" preload="auto"></audio>
250
                 <audio id="userJoined" src="sounds/joined.wav" preload="auto"></audio>

+ 3
- 3
modules/UI/UI.js View File

298
     // Add myself to the contact list.
298
     // Add myself to the contact list.
299
     ContactList.addContact(id, true);
299
     ContactList.addContact(id, true);
300
 
300
 
301
-    //update default button states before showing the toolbar
302
-    //if local role changes buttons state will be again updated
303
-    UI.updateLocalRole(false);
301
+    // Update default button states before showing the toolbar
302
+    // if local role changes buttons state will be again updated.
303
+    UI.updateLocalRole(APP.conference.isModerator);
304
 
304
 
305
     UI.showToolbar();
305
     UI.showToolbar();
306
 
306
 

+ 3
- 2
modules/UI/videolayout/VideoLayout.js View File

465
                 return;
465
                 return;
466
 
466
 
467
             if (member.isModerator()) {
467
             if (member.isModerator()) {
468
-                remoteVideo.removeRemoteVideoMenu();
469
                 remoteVideo.createModeratorIndicatorElement();
468
                 remoteVideo.createModeratorIndicatorElement();
470
-            } else if (isModerator) {
469
+            }
470
+
471
+            if (isModerator) {
471
                 // We are moderator, but user is not - add menu
472
                 // We are moderator, but user is not - add menu
472
                 if(!remoteVideo.hasRemoteVideoMenu) {
473
                 if(!remoteVideo.hasRemoteVideoMenu) {
473
                     remoteVideo.addRemoteVideoMenu();
474
                     remoteVideo.addRemoteVideoMenu();

Loading…
Cancel
Save