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

Containers created with PopUpManager and toolbars are removed from the display list when the user is logged out from the application.

Browse Source
This commit is contained in:
Ghaz Triki 2016-03-11 23:02:10 +01:00
parent a46d3656f9
commit e0273aac7d
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
View File

@ -526,9 +526,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
logoutWindow.y = point1.y - (logoutWindow.height/2);
logoutWindow.setReason(reason);
mdiCanvas.removeAllWindows();
mdiCanvas.removeAllPopUps();
removeToolBars();
} else {
mdiCanvas.removeAllWindows();
mdiCanvas.removeAllPopUps();
removeToolBars();
var pageHost:String = FlexGlobals.topLevelApplication.url.split("/")[0];
var pageURL:String = FlexGlobals.topLevelApplication.url.split("/")[2];
LOGGER.debug("SingOut to [{0}//{1}/bigbluebutton/api/signOut]", [pageHost, pageURL]);
@ -540,6 +542,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
}
/**
* Removes toolbars from the display list.
* Used only when the user completely logged out.
*/
private function removeToolBars():void{
this.removeChild(toolbar);
this.removeChild(controlBar);
}
public function getLogoutUrl():String {
var logoutUrl:String = BBB.initUserConfigManager().getLogoutUrl();
if (logoutUrl == null) {
@ -562,7 +573,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
var logoutURL:String = getLogoutUrl();
var request:URLRequest = new URLRequest(logoutURL);
LOGGER.debug("Logging out to: {0}", [logoutURL]);
navigateToURL(request, '_self');
//navigateToURL(request, '_self');
}

11
bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
View File

@ -79,8 +79,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
}
public function removeAllWindows():void{
this.windowManager.removeAll();
/**
* Removes all display list containers created using PopUpManager
*/
public function removeAllPopUps():void{
for (var i:int = systemManager.numChildren-1; i>0; i-=1){
if(!(systemManager.getChildAt(i) is LoggedOutWindow)){
systemManager.removeChildAt(i);
}
}
}
public function resetWindowLayout():void{