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

Merge branch '090-change-role' into mconf-live0.6.2

Browse Source 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
This commit is contained in:
Felipe Cecagno 2015-01-23 17:57:22 -02:00
commit e0acedce5f
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
View File

@ -409,7 +409,7 @@ package org.bigbluebutton.main.model.users
n.presenter = user.presenter;
n.mood = user.mood;
n.moodTimestamp = user.moodTimestamp;
n.role = user.role;
n._role = user._role;
n.room = user.room;
n.customdata = user.customdata;
n.media = user.media;

2
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
View File

@ -37,8 +37,8 @@ $Id: $
<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}" method="localeChanged" />
<mate:Listener type="{ShortcutEvent.MUTE_ME_EVENT}" method="toggleMuteMeState" />
<mate:Listener type="{EventConstants.USER_TALKING}" method="handleUserTalking" />
<mate:Listener type="{ChangeMyRole.CHANGE_MY_ROLE_EVENT}" method="refreshRole" />
<mate:Listener type="{LockControlEvent.CHANGED_LOCK_SETTINGS}" method="lockSettingsChanged" />
<mate:Listener type="{ChangeMyRole.CHANGE_MY_ROLE_EVENT}" method="refreshRole" />
<mate:Listener type="{BBBEvent.USER_VOICE_JOINED}" method="handleJoinedVoiceConferenceEvent" />
<mate:Listener type="{BBBEvent.USER_VOICE_LEFT}" method="handleLeftVoiceConferenceEvent" />
<mate:Listener type="{BBBEvent.USER_VOICE_MUTED}" method="handleVoiceMutedEvent" />

18
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
View File

@ -112,15 +112,17 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
trace("RecordButton:doChangeRecordingStatus changing record status to " + event.payload.recording);
}
private function updateButton(recording:Boolean):void {
this.selected = recording;
resourcesChanged();
this.enabled = UserManager.getInstance().getConference().amIModerator() && MeetingModel.getInstance().meeting.allowStartStopRecording;
}
private function onRecordingStatusChanged(event:BBBEvent):void {
if (event.payload.remote) {
this.selected = event.payload.recording;
resourcesChanged();
if (UserManager.getInstance().getConference().amIModerator() && MeetingModel.getInstance().meeting.allowStartStopRecording) {
this.enabled = true;
}
updateButton(event.payload.recording);
trace("RecordButton:onRecordingStatusChanged changing record status to " + event.payload.recording);
}
@ -194,7 +196,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function refreshRole(e:ChangeMyRole):void {
resourcesChanged();
updateButton(this.selected);
}
]]>
</mx:Script>

6
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
View File

@ -78,6 +78,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var dispatcher:Dispatcher;
public function lockSettingsChanged(e:*):void{
if (UsersUtil.amIModerator() || UsersUtil.amIPresenter()){
// Ignore lock setting changes as
// or presenter we are moderator.
return;
}
updateButton();
}