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

Merge branch 'master' into pulling-video-dock

Browse Source
This commit is contained in:
Richard Alam 2011-09-21 12:20:48 -04:00
commit 674916748b
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bigbluebutton-client/src/DynamicInfoModule.mxml
View File

@ -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);
}
}
}

1
bigbluebutton-client/src/org/bigbluebutton/main/model/ConferenceParameters.as
View File

@ -62,6 +62,7 @@ package org.bigbluebutton.main.model
*/
public var welcome:String;
public var meetingID:String;
/**
* External unique user id.
*/

2
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleDescriptor.as
View File

@ -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);
}

1
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
View File

@ -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;