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

Fixes moderator notifications on moderator indicator disabled

This commit is contained in:
yanas 2016-09-27 14:32:54 -05:00
parent 6ccc58a060
commit f10177a352
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/UI/UI.js
View File

@ -675,7 +675,9 @@ UI.updateLocalRole = function (isModerator) {
SettingsMenu.showFollowMeOptions(isModerator); SettingsMenu.showFollowMeOptions(isModerator);
if (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(); Recording.checkAutoRecord();
} }
@ -689,7 +691,9 @@ UI.updateLocalRole = function (isModerator) {
UI.updateUserRole = function (user) { UI.updateUserRole = function (user) {
VideoLayout.showModeratorIndicator(); 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; return;
} }

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

@ -291,7 +291,9 @@ SmallVideo.prototype.getVideoMutedIndicator = function () {
*/ */
SmallVideo.prototype.createModeratorIndicatorElement = function () { SmallVideo.prototype.createModeratorIndicatorElement = function () {
// don't create moderator indicator if DISABLE_FOCUS_INDICATOR is true // 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 // Show moderator indicator
var indicatorSpan = $('#' + this.videoSpanId + ' .focusindicator'); var indicatorSpan = $('#' + this.videoSpanId + ' .focusindicator');