diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as index cdf8b51eed83fc5e9d5f46d83fe71656c3f9eeea..ca67ab73b5606de155021c76799ffb51948cc597 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as @@ -4,8 +4,10 @@ package org.bigbluebutton.main.events public class AppVersionEvent extends Event { - public var appVersion:String; + public static const APP_VERSION_EVENT:String = "APP VERSION EVENT"; + public var appVersion:String; + public var localVersion:String; public function AppVersionEvent() { diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as index 37716029329089bdcab337a21b31c0518816e927..f5ef9a8f1e27f44beb0ad60535a3d8eb21679f06 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as @@ -65,9 +65,7 @@ package org.bigbluebutton.main.model if (xml.language.@userSelectionEnabled == "true") languageEnabled = true; else languageEnabled = false; if (xml.skinning.@enabled == "true") skinning = xml.skinning.@url; - var versionEvent:AppVersionEvent = new AppVersionEvent(); - versionEvent.appVersion = version; - dispatcher.dispatchEvent(versionEvent); + if (xml.debug.@showDebugWindow == "true") showDebug = true; } diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as index b3483b6ee5f6eee814fbe7fe8da7c1bce82b200a..2f9bdcca811396fd17261e8897da519c6252bb5b 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as @@ -21,19 +21,15 @@ package org.bigbluebutton.main.model.modules { import com.asfusion.mate.events.Dispatcher; - import flash.events.Event; - import flash.net.URLLoader; - import flash.net.URLRequest; import flash.system.ApplicationDomain; import flash.utils.Dictionary; import mx.collections.ArrayCollection; - import mx.controls.Alert; import org.bigbluebutton.common.IBigBlueButtonModule; import org.bigbluebutton.common.LogUtil; import org.bigbluebutton.common.Role; - import org.bigbluebutton.main.events.ModuleLoadEvent; + import org.bigbluebutton.main.events.AppVersionEvent; import org.bigbluebutton.main.model.ConferenceParameters; import org.bigbluebutton.main.model.ConfigParameters; @@ -145,11 +141,20 @@ package org.bigbluebutton.main.model.modules } if (allModulesLoaded()) { + sendAppAndLocaleVersions(); startAllModules(); modulesDispatcher.sendAllModulesLoadedEvent(); } } + private function sendAppAndLocaleVersions():void { + var dispatcher:Dispatcher = new Dispatcher(); + var versionEvent:AppVersionEvent = new AppVersionEvent(); + versionEvent.appVersion = configParameters.version; + versionEvent.localVersion = configParameters.localeVersion; + dispatcher.dispatchEvent(versionEvent); + } + public function moduleStarted(name:String, started:Boolean):void { var m:ModuleDescriptor = getModule(name); if (m != null) { diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml index 55768b80f941ca46893520147ec8c74136ca23c1..b792295ccb9d99ecb2da01e3b6ccfe011668d440 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml @@ -89,6 +89,7 @@ // LIVE or PLAYBACK private var _mode:String = 'LIVE'; [Bindable] public var appVersion:String = '0.7'; + private var localeVersion:String = 'old'; [Bindable] public var numberOfModules:int = 0; [Bindable] private var fullscreen_icon:Class = images.full_screen; @@ -112,6 +113,8 @@ private function handleApplicationVersionEvent(event:AppVersionEvent):void { appVersion = event.appVersion; + localeVersion = event.localVersion; + checkLocaleVersion(localeVersion); } private function fullScreenHandler(evt:FullScreenEvent):void { @@ -158,6 +161,7 @@ } private function handleOpenWindowEvent(event:OpenWindowEvent):void { + var window:IBbbModuleWindow = event.window; mdiCanvas.addWindow(window); } diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/OldLocaleWarnWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/OldLocaleWarnWindow.mxml index 4726e056c48d096f4f970d5b40326cec933b4c28..7953ce0d7f9ee20f66fdcee9a3d73091e032afb0 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/OldLocaleWarnWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/OldLocaleWarnWindow.mxml @@ -25,6 +25,7 @@ x="168" y="86" layout="vertical" width="400" height="150" horizontalAlign="center"> <mx:Script> <![CDATA[ + import org.bigbluebutton.common.LogUtil; import org.bigbluebutton.util.i18n.ResourceUtil; import mx.controls.Alert; import mx.managers.PopUpManager; @@ -52,8 +53,10 @@ } private function redirect():void { + var pageHost:String = mx.core.Application.application.url.split("/")[0]; var pageURL:String = mx.core.Application.application.url.split("/")[2]; - var url:URLRequest = new URLRequest("http://" + pageURL + "/bigbluebutton/conference-session/signOut"); + var url:URLRequest = new URLRequest(pageHost + "//" + pageURL + "/bigbluebutton/api/signOut"); + LogUtil.debug("Log out url: " + pageURL); navigateToURL(url, '_self'); PopUpManager.removePopUp(this); }