From 22f278207b92e0f0a388d20371f85ce53c95f9e4 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Fri, 8 May 2009 13:56:13 +0000 Subject: [PATCH] - remove listeners window when user logs out git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1413 af16638f-c34d-0410-8cfa-b39d5352b314 --- .../main/view/MainApplicationShellMediator.as | 2 +- .../modules/listeners/ListenersModuleEndpointMediator.as | 8 ++++---- .../modules/listeners/controller/StopCommand.as | 1 + .../modules/listeners/model/service/ListenersSOService.as | 5 ++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as b/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as index ddea8d84f2..7c507a6998 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as @@ -130,7 +130,7 @@ package org.bigbluebutton.main.view break; case MainApplicationConstants.MODULE_STOPPED: var info:Object = notification.getBody(); - handleModuleStopped(info.moduleId, info.errors); + // handleModuleStopped(info.moduleId, info.errors); break; case MainApplicationConstants.LOADED_MODULE: shell.loadedModules.text += notification.getBody() + "(loaded) "; diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/ListenersModuleEndpointMediator.as b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/ListenersModuleEndpointMediator.as index 5a9a520cfe..003320f09f 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/ListenersModuleEndpointMediator.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/ListenersModuleEndpointMediator.as @@ -65,10 +65,10 @@ package org.bigbluebutton.modules.listeners case ListenersModuleConstants.DISCONNECTED: LogUtil.debug(NAME + ':Sending MODULE_STOPPED message to main'); facade.sendNotification(ListenersModuleConstants.CLOSE_WINDOW); - var info:Object = notification.getBody(); - info["moduleId"] = _module.moduleId; - _endpoint.sendMessage(EndpointMessageConstants.MODULE_STOPPED, - EndpointMessageConstants.TO_MAIN_APP, info); +// var info:Object = notification.getBody(); +// info["moduleId"] = _module.moduleId; +// _endpoint.sendMessage(EndpointMessageConstants.MODULE_STOPPED, +// EndpointMessageConstants.TO_MAIN_APP, info); break; case ListenersModuleConstants.ADD_WINDOW: LogUtil.debug(NAME + ':Sending ADD_WINDOW message to main'); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/controller/StopCommand.as b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/controller/StopCommand.as index 748ebb9ab4..8a2b1d1f72 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/controller/StopCommand.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/controller/StopCommand.as @@ -26,6 +26,7 @@ package org.bigbluebutton.modules.listeners.controller public class StopCommand extends SimpleCommand { override public function execute(notification:INotification):void{ + LogUtil.debug("ListenersModule StopCommand"); if (facade.hasProxy(ListenersProxy.NAME)) { var p:ListenersProxy = facade.retrieveProxy(ListenersProxy.NAME) as ListenersProxy; p.stop(); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/service/ListenersSOService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/service/ListenersSOService.as index e65c0a8937..e6eb34be5b 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/service/ListenersSOService.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/service/ListenersSOService.as @@ -91,7 +91,10 @@ package org.bigbluebutton.modules.listeners.model.service private function leave():void { - if (_listenersSO != null) _listenersSO.close(); + if (_listenersSO != null) { + _listenersSO.close(); + } + notifyConnectionStatusListener(false); } public function addConnectionStatusListener(connectionListener:Function):void {