diff --git a/bigbluebutton-client/src/DynamicInfoModule.mxml b/bigbluebutton-client/src/DynamicInfoModule.mxml index e01b6a6c791b8078efcd590277615c4c05b9673c..255fa225a7797460507aa1633339fe6fea1c47db 100755 --- a/bigbluebutton-client/src/DynamicInfoModule.mxml +++ b/bigbluebutton-client/src/DynamicInfoModule.mxml @@ -20,7 +20,11 @@ $Id: $ --> -<mx:Module xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="onCreationComplete()" implements="org.bigbluebutton.common.IBigBlueButtonModule" xmlns:maps="org.bigbluebutton.modules.dynamicinfo.maps.*" xmlns:views="org.bigbluebutton.modules.dynamicinfo.views.*"> +<mx:Module xmlns:mx="http://www.adobe.com/2006/mxml" + creationComplete="onCreationComplete()" + implements="org.bigbluebutton.common.IBigBlueButtonModule" + xmlns:maps="org.bigbluebutton.modules.dynamicinfo.maps.*" + xmlns:views="org.bigbluebutton.modules.dynamicinfo.views.*"> <mx:Script> <![CDATA[ import com.asfusion.mate.events.Dispatcher; @@ -142,7 +146,8 @@ cmp.height = 22; var evt:ToolbarButtonEvent = new ToolbarButtonEvent(ToolbarButtonEvent.ADD); evt.button = cmp as IBbbToolbarComponent; - globalDispatcher.dispatchEvent(evt); + var dispatcher:Dispatcher = new Dispatcher(); + dispatcher.dispatchEvent(evt); } } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConferenceParameters.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConferenceParameters.as index 86f5963ba230b4d74081de7174400c6b5d6a1252..781373d585d21cc76f261de4ac8b6684a854bc12 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConferenceParameters.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConferenceParameters.as @@ -62,6 +62,7 @@ package org.bigbluebutton.main.model */ public var welcome:String; + public var meetingID:String; /** * External unique user id. */ diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as index 3dd111ab29c8033f7fdf30a48d09a8fe13af020f..af966d0358ec95ae37e6f316b1342c259f532682 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as @@ -180,7 +180,7 @@ package org.bigbluebutton.main.model.modules addAttribute("webvoiceconf", conferenceParameters.webvoiceconf); addAttribute("welcome", conferenceParameters.welcome); addAttribute("externUserID", conferenceParameters.externUserID); - + addAttribute("meetingID", conferenceParameters.meetingID); addAttribute("protocol", protocol); useProtocol(protocol); } diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as index 4bf27f9e4e4a38db144b65a43efa3c3f680244f4..de27aa3e84bccded9323ae97334ff7607dd28028 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as @@ -80,6 +80,7 @@ package org.bigbluebutton.main.model.users _conferenceParameters.webvoiceconf = result.webvoiceconf; _conferenceParameters.voicebridge = result.voicebridge; _conferenceParameters.welcome = result.welcome; + _conferenceParameters.meetingID = result.meetingID; _conferenceParameters.externUserID = result.externUserID; _conferenceParameters.logoutUrl = result.logoutUrl; _conferenceParameters.record = true;