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

Merge pull request #180 from SenecaCDOT-BigBlueButton/disable-private-chat

Browse Source 
improved disabling private chat so that the whole tab doesn't disappear
This commit is contained in:
Richard Alam 2013-06-11 13:15:10 -07:00
commit d901c70963
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,9 +86,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:Script>
<mx:HBox width="100%" height="100%" >
<mx:VBox height="100%" width="50%" visible="{chatOptions.privateEnabled}">
<mx:Label id="lblSelect" text="{ResourceUtil.getInstance().getString('bbb.chat.privateChatSelect')}" />
<mx:VBox height="100%" width="50%" >
<mx:Label id="lblSelect" text="{ResourceUtil.getInstance().getString('bbb.chat.privateChatSelect')}" visible="{chatOptions.privateEnabled}" includeInLayout="{chatOptions.privateEnabled}"/>
<mx:List id="usersList" height="100%" width="100%" dataProvider="{users}" dragEnabled="false"
visible="{chatOptions.privateEnabled}" includeInLayout="{chatOptions.privateEnabled}"
itemRenderer="org.bigbluebutton.modules.chat.views.UserRenderer"
itemClick="openPrivateChat(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.chat.usersList.toolTip')}"/>
<mx:VBox id="optionsBox" height="100%" width="50%" >

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

@ -123,10 +123,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
openChatBoxFor(PUBLIC_CHAT_USERID, true);
makePublicChatUncloseable();
if (chatOptions.privateEnabled) {
createAddTabBox();
makeAddPrivateChatUncloseable();
}
// you have to always create the AddTabBox because we always need to give people access to the dropdown to change font size
createAddTabBox();
makeAddPrivateChatUncloseable();
addEventListener(SuperTabEvent.TAB_CLOSE, onUserClosedTab);