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

Merge pull request #946 from jitsi/fix-moderator-notifications 

Fixes moderator notifications on moderator indicator disabled
This commit is contained in:
Paweł Domas 2016-09-28 14:26:00 -05:00 committed by GitHub
parent 8f4b94f732 dad3c57fad
commit b4a191e27a
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conference.js
View File

@ -1153,8 +1153,10 @@ export default {
room.on(ConferenceEvents.USER_ROLE_CHANGED, (id, role) => {
if (this.isLocalId(id)) {
console.info(`My role changed, new role: ${role}`);
this.isModerator = room.isModerator();
APP.UI.updateLocalRole(room.isModerator());
if (this.isModerator !== room.isModerator()) {
this.isModerator = room.isModerator();
APP.UI.updateLocalRole(room.isModerator());
}
} else {
let user = room.getParticipantById(id);
if (user) {

8
modules/UI/UI.js
View File

@ -689,7 +689,9 @@ UI.updateLocalRole = function (isModerator) {
SettingsMenu.showFollowMeOptions(isModerator);
if (isModerator) {
messageHandler.notify(null, "notify.me", 'connected', "notify.moderator");
if (!interfaceConfig.DISABLE_FOCUS_INDICATOR)
messageHandler
.notify(null, "notify.me", 'connected', "notify.moderator");
Recording.checkAutoRecord();
}
@ -703,7 +705,9 @@ UI.updateLocalRole = function (isModerator) {
UI.updateUserRole = function (user) {
VideoLayout.showModeratorIndicator();
if (!user.isModerator()) {
// We don't need to show moderator notifications when the focus (moderator)
// indicator is disabled.
if (!user.isModerator() || interfaceConfig.DISABLE_FOCUS_INDICATOR) {
return;
}

4
modules/UI/videolayout/SmallVideo.js
View File

@ -312,7 +312,9 @@ SmallVideo.prototype.getVideoMutedIndicator = function () {
*/
SmallVideo.prototype.createModeratorIndicatorElement = function () {
// don't create moderator indicator if DISABLE_FOCUS_INDICATOR is true
if (interfaceConfig.DISABLE_FOCUS_INDICATOR) return false;
if (interfaceConfig.DISABLE_FOCUS_INDICATOR)
return false;
// Show moderator indicator
var indicatorSpan = $('#' + this.videoSpanId + ' .focusindicator');