From f0a6223dccab6c6a529b677b3786bdbdbc22fde9 Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Sat, 13 Aug 2016 20:02:50 +0100
Subject: [PATCH] When is user is logged out from the breakout room conference
the window is closed.
---
.../main/views/LoggedOutWindow.mxml | 28 +++++++++++--------
.../modules/users/views/UsersWindow.mxml | 1 +
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
index f723c90e58..3de2383ea6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
@@ -32,6 +32,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.core.BBB;
+ import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.model.users.events.ConnectionFailedEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
@@ -43,17 +44,22 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function init():void {
addEventListener(Event.CLOSE, onUserLoggedOutWindowClose);
}
-
- private function redirect():void {
- var logoutURL:String = BBB.getLogoutURL();
- var request:URLRequest = new URLRequest(logoutURL);
- LOGGER.debug("Log out url: " + logoutURL);
- request.method = URLRequestMethod.GET;
- urlLoader = new URLLoader();
- urlLoader.addEventListener(Event.COMPLETE, handleComplete);
- urlLoader.addEventListener(IOErrorEvent.IO_ERROR, handleRedirectError);
- urlLoader.load(request);
- }
+
+ private function redirect():void {
+ if (!UserManager.getInstance().getConference().isBreakout) {
+ var logoutURL:String = BBB.getLogoutURL();
+ var request:URLRequest = new URLRequest(logoutURL);
+ LOGGER.debug("Log out url: " + logoutURL);
+ request.method = URLRequestMethod.GET;
+ urlLoader = new URLLoader();
+ urlLoader.addEventListener(Event.COMPLETE, handleComplete);
+ urlLoader.addEventListener(IOErrorEvent.IO_ERROR, handleRedirectError);
+ urlLoader.load(request);
+ } else {
+ ExternalInterface.call("window.close");
+ }
+ }
+
private function handleComplete(e:Event):void {
LOGGER.debug("Client URL=[{0}]", [FlexGlobals.topLevelApplication.url]);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
index 7669ffea75..e40a80fb95 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -585,6 +585,7 @@
<mx:VBox id="roomsBox" styleName="breakoutRoomsBox"
visible="{breakoutRoomsList.length > 0 && amIModerator}"
includeInLayout="{breakoutRoomsList.length > 0 && amIModerator}"
+ horizontalScrollPolicy="off"
width="100%" height="180">
<mx:HBox width="100%">
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}"/>
--
GitLab