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

Merge pull request #5121 from capilkey/update-air-2.1

Browse Source 
Updates for the 2.1 AIR client
This commit is contained in:
Fred Dixon 2018-02-08 14:35:24 -05:00 committed by GitHub
commit 3fbb8e6910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatItemRenderer.mxml
View File

@ -48,7 +48,8 @@
participantIcon.visible = participantIcon.includeInLayout = false; participantIcon.visible = participantIcon.includeInLayout = false;
} else { } else {
titleGroup.includeInLayout = titleGroup.visible = true; titleGroup.includeInLayout = titleGroup.visible = true;
if (m.name == " ") { if (m.name == " " || m.name == "") {
username.text = "";
participantIcon.visible = participantIcon.includeInLayout = false; participantIcon.visible = participantIcon.includeInLayout = false;
} else { } else {
username.text = m.name; username.text = m.name;

6
clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatViewMediatorBase.as
View File

@ -15,6 +15,7 @@ package org.bigbluebutton.lib.chat.views {
import robotlegs.bender.bundles.mvcs.Mediator; import robotlegs.bender.bundles.mvcs.Mediator;
import spark.components.VScrollBar;
import spark.core.NavigationUnit; import spark.core.NavigationUnit;
public class ChatViewMediatorBase extends Mediator { public class ChatViewMediatorBase extends Mediator {
@ -58,7 +59,10 @@ package org.bigbluebutton.lib.chat.views {
protected function onNewMessage(chatId:String):void { protected function onNewMessage(chatId:String):void {
if (_chat && _chat.chatId == chatId) { if (_chat && _chat.chatId == chatId) {
if (view) { if (view) {
view.chatList.scroller.verticalScrollBar.value = view.chatList.scroller.verticalScrollBar.maximum; var vScrollBar:VScrollBar = view.chatList.scroller.verticalScrollBar;
if (vScrollBar) {
vScrollBar.value = vScrollBar.maximum;
}
} }
_chat.newMessages = 0; _chat.newMessages = 0;
} }

3
clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/video/services/VideoConnection.as
View File

@ -112,8 +112,7 @@ package org.bigbluebutton.lib.video.services {
public function connect():void { public function connect():void {
trace("Video connect"); trace("Video connect");
trace("Don't connect to video yet because it needs to have auth token added"); baseConnection.connect(uri, conferenceParameters.meetingID, userSession.userId, conferenceParameters.authToken);
//baseConnection.connect(uri, conferenceParameters.meetingID, userSession.userId);
} }
public function disconnect(onUserCommand:Boolean):void { public function disconnect(onUserCommand:Boolean):void {

2
clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/voice/services/VoiceConnection.as
View File

@ -104,7 +104,7 @@ package org.bigbluebutton.lib.voice.services {
_listenOnly = listenOnly; _listenOnly = listenOnly;
_username = encodeURIComponent(confParams.internalUserID + "-bbbID-" + confParams.username); _username = encodeURIComponent(confParams.internalUserID + "-bbbID-" + confParams.username);
trace("Voice app connect"); trace("Voice app connect");
baseConnection.connect(_applicationURI, confParams.meetingID, confParams.externUserID, _username); baseConnection.connect(_applicationURI, confParams.meetingID, confParams.externUserID, _username, confParams.authToken);
} }
public function disconnect(onUserCommand:Boolean):void { public function disconnect(onUserCommand:Boolean):void {