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

Merge pull request #3010 from capilkey/fix-3009

Browse Source 
Show chat options tab when private chat disabled
This commit is contained in:
Richard Alam 2016-02-09 14:23:18 -05:00
commit 5189dd684a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
View File

@ -58,6 +58,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function onCreationComplete():void{ private function onCreationComplete():void{
users = UserManager.getInstance().getConference().users; users = UserManager.getInstance().getConference().users;
if (!chatOptions.privateEnabled) {
usersList.includeInLayout = usersList.visible = false;
}
if (fontSizes.indexOf(chatOptions.fontSize) != -1) { if (fontSizes.indexOf(chatOptions.fontSize) != -1) {
cmbFontSize.selectedItem = chatOptions.fontSize; cmbFontSize.selectedItem = chatOptions.fontSize;
changeFontSize(); // have to manually call it because the change event doesn't fire changeFontSize(); // have to manually call it because the change event doesn't fire
@ -107,8 +112,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
* For the Options tab focus the users list instead of the text area. * For the Options tab focus the users list instead of the text area.
**/ **/
public function focusToTextMessageArea():void { public function focusToTextMessageArea():void {
if (usersList.visible) {
usersList.setFocus(); usersList.setFocus();
usersList.drawFocus(true); usersList.drawFocus(true);
} else {
cmbFontSize.setFocus();
cmbFontSize.drawFocus(true);
}
} }
private function lockSettingsChanged(e:Event):void { private function lockSettingsChanged(e:Event):void {

6
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
View File

@ -91,10 +91,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
openChatBoxFor(PUBLIC_CHAT_USERID, true); openChatBoxFor(PUBLIC_CHAT_USERID, true);
makePublicChatUncloseable(); makePublicChatUncloseable();
if (chatOptions.privateEnabled) { createAddTabBox();
createAddTabBox(); makeAddPrivateChatUncloseable();
makeAddPrivateChatUncloseable();
}
ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing