BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new option "moderatorUnmute"

Browse Source
This commit is contained in:
Ghazi Triki 2017-10-06 10:57:19 +01:00
parent 23bb6bd34e
commit cb1ae776ea
4 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-client/resources/config.xml.template
View File

@ -40,6 +40,7 @@
enableEmojiStatus="true"
enableSettingsButton="true"
enableGuestUI="false"
moderatorUnmute="true"
baseTabIndex="301"
/>

5
bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
View File

@ -33,7 +33,10 @@ package org.bigbluebutton.modules.users.model {
[Bindable]
public var enableSettingsButton:Boolean = true;
[Bindable]
public var moderatorUnmute:Boolean = true;
[Bindable]
public var enableGuestUI:Boolean = false;

101
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
View File

@ -68,22 +68,22 @@
private var options:UsersOptions;
private var myMenu:Menu = null;
private function onCreationComplete():void{
refreshRole(UsersUtil.amIModerator());
this.addEventListener(FlexEvent.DATA_CHANGE, dataChangeHandler);
BindingUtils.bindSetter(updateButtons, listenOnlyInd, "visible");
BindingUtils.bindSetter(updateButtons, voiceJoinedInd, "visible");
BindingUtils.bindSetter(updateButtons, muteInd, "visible");
BindingUtils.bindSetter(updateButtons, userLockedInd, "visible");
BindingUtils.bindSetter(updateButtons, hasStreamInd, "visible");
BindingUtils.bindSetter(updateButtons, viewingStreamInd, "visible");
options = Options.getOptions(UsersOptions) as UsersOptions;
}
private function onCreationComplete():void {
options = Options.getOptions(UsersOptions) as UsersOptions;
refreshRole(UsersUtil.amIModerator());
this.addEventListener(FlexEvent.DATA_CHANGE, dataChangeHandler);
BindingUtils.bindSetter(updateButtons, listenOnlyInd, "visible");
BindingUtils.bindSetter(updateButtons, voiceJoinedInd, "visible");
BindingUtils.bindSetter(updateButtons, muteInd, "visible");
BindingUtils.bindSetter(updateButtons, userLockedInd, "visible");
BindingUtils.bindSetter(updateButtons, hasStreamInd, "visible");
BindingUtils.bindSetter(updateButtons, viewingStreamInd, "visible");
}
private function dataChangeHandler(e:Event):void {
//rest rolledOver when the data changes because onRollOut wont be called if the row moves
if (data != null) {
@ -171,29 +171,29 @@
e.internalUserID = data.userId;
dispatchEvent(e);
}
private function updateButtons(voiceMuted:Boolean = false):void {
// reset the mute image filter so the talking indicator doesn't stick
muteImg.filters = null;
var ls:LockSettingsVO = UsersUtil.getLockSettings();
if (data != null) {
settingsBtn.visible = rolledOver && !data.me && !UsersUtil.isBreakout();
if (!data.inVoiceConf) {
muteImg.visible = false;
muteImg.includeInLayout = false;
muteBtn.visible = false;
muteBtn.includeInLayout = true;
if ( !data.inVoiceConf || ( options.moderatorUnmute == false && UsersUtil.amIModerator() && !UsersUtil.isMe(data.userId) ) ) {
muteImg.visible = false;
muteImg.includeInLayout = false;
muteBtn.visible = false;
muteBtn.includeInLayout = true;
} else {
if (data.listenOnly) {
muteImg.source = getStyle("iconSound");
muteImg.visible = true;
muteImg.includeInLayout = true;
muteBtn.visible = false;
muteBtn.includeInLayout = false;
} else if (data.locked && ls.getDisableMic()) {
if (data.listenOnly) {
muteImg.source = getStyle("iconSound");
muteImg.visible = true;
muteImg.includeInLayout = true;
muteBtn.visible = false;
muteBtn.includeInLayout = false;
} else if (data.locked && ls.getDisableMic()) {
muteImg.visible = true;
muteImg.includeInLayout = true;
muteBtn.visible = false;
@ -205,20 +205,20 @@
muteBtn.includeInLayout = rolledOver;
muteBtn.enabled = true;
if(data.talking && !rolledOver){
if (data.talking && !rolledOver) {
muteImg.filters = [new GlowFilter(getStyle("glowFilterColor"), 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
}else{
} else {
muteImg.filters = [];
}
}
}
if (data.role == Role.MODERATOR){
if (data.role == Role.MODERATOR) {
lockImg.visible = false;
lockImg.includeInLayout = true;
lockBtn.visible = false;
lockBtn.includeInLayout = false;
} else if(moderator && ls.isAnythingLocked()) {
} else if (moderator && ls.isAnythingLocked()) {
lockImg.visible = !rolledOver;
lockImg.includeInLayout = !rolledOver;
lockBtn.visible = rolledOver;
@ -230,7 +230,7 @@
lockBtn.visible = false;
lockBtn.includeInLayout = false;
}
if (data.hasStream) {
// if it's myself or if I'm watching all the streams from the given user, then don't activate the button
if (data.me || data.isViewingAllStreams()) {
@ -253,20 +253,19 @@
if (!rolledOver) {
if (data.inVoiceConf) {
if (data.listenOnly) {
muteImg.source = getStyle("iconSound");
} else if (data.muted) {
muteImg.source = getStyle("iconAudioMuted");
} else {
muteImg.source = getStyle("iconAudio");
}
if (data.listenOnly) {
muteImg.source = getStyle("iconSound");
} else if (data.muted) {
muteImg.source = getStyle("iconAudioMuted");
} else {
muteImg.source = getStyle("iconAudio");
}
}
if ( data.locked && !data.presenter && ls.isAnythingLocked() ) {
if (data.locked && !data.presenter && ls.isAnythingLocked()) {
lockImg.source = getStyle("iconLock");
}
else {
} else {
lockImg.source = null;
}
} else {
@ -274,7 +273,7 @@
muteBtn.setStyle("icon", getStyle("iconAudio"));
else
muteBtn.setStyle("icon", getStyle("iconAudioMuted"));
if (data.locked == rolledOverLock)
lockBtn.setStyle("icon", getStyle("iconUnlock"));
else

16
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
View File

@ -384,13 +384,15 @@ $Id: $
paramsMenuData = [];
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.clearAllStatus'), icon: getStyle('iconClearStatus'), handler: resetEmojiStatuses});
if (!roomMuted) {
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAll'), icon: getStyle('iconAudioMuted'), handler: muteAll});
var presenter:User2x = UsersUtil.getPresenter();
if (presenter != null)
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAllExcept') + ": " + presenter.name, icon: getStyle('iconAudioMuted'), handler: muteAlmostAll});
} else
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.unmuteAll'), icon: getStyle('iconAudio'), handler: muteAll});
if (partOptions.moderatorUnmute == true) {
if (!roomMuted) {
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAll'), icon: getStyle('iconAudioMuted'), handler: muteAll});
var presenter:User2x = UsersUtil.getPresenter();
if (presenter != null)
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAllExcept') + ": " + presenter.name, icon: getStyle('iconAudioMuted'), handler: muteAlmostAll});
} else
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.unmuteAll'), icon: getStyle('iconAudio'), handler: muteAll});
}
paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.lockSettings'), icon: getStyle('iconLock'), handler: lockSettings});
if (breakoutOptions.enabled && amIModerator && !UsersUtil.isBreakout()) {