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

show the disabled record button for viewers; hide confirmation alert if the moderator lose its role

Browse Source
This commit is contained in:
Felipe Cecagno 2015-11-13 14:33:43 -02:00
parent 6e5729fc67
commit 66b96398e6
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
View File

@ -191,11 +191,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function refreshModeratorButtonsVisibility(e:*):void {
showGuestSettingsButton = UsersUtil.amIModerator()
&& UserManager.getInstance().getConference().getMyUser() != null
&& !UserManager.getInstance().getConference().getMyUser().waitingForAcceptance;
var userLoaded:Boolean = UserManager.getInstance().getConference().getMyUser() != null
&& ! UserManager.getInstance().getConference().getMyUser().waitingForAcceptance;
showRecordButton = showGuestSettingsButton && UserManager.getInstance().getConference().record;
showGuestSettingsButton = userLoaded && UsersUtil.amIModerator();
showRecordButton = userLoaded && UserManager.getInstance().getConference().record;
}
public function addButton(name:String):Button{

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

@ -44,6 +44,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import mx.controls.Alert;
import mx.events.CloseEvent;
import mx.managers.PopUpManager;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.core.model.MeetingModel;
@ -57,6 +58,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var recordingFlag:Boolean;
private var firstAudioJoin:Boolean = true;
private var layoutOptions:LayoutOptions = null;
private var _confirmationAlert:Alert = null;
[Embed(source="/org/bigbluebutton/common/assets/images/record.png")]
private var recordReminderIcon:Class;
@ -65,26 +67,42 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing
}
private function confirmChangeRecordingStatus():void {
trace("Confirming recording status change!!!!");
// need to save the flag in case of any remote update on the recording status
recordingFlag = !this.selected;
private function hideConfirmationAlert():void {
if (_confirmationAlert != null) {
if (_confirmationAlert.visible) {
PopUpManager.removePopUp(_confirmationAlert);
}
_confirmationAlert = null;
}
}
private function showConfirmationAlert():void {
hideConfirmationAlert();
var message:String = recordingFlag? ResourceUtil.getInstance().getString('bbb.mainToolbar.recordBtn.confirm.message.start'): ResourceUtil.getInstance().getString('bbb.mainToolbar.recordBtn.confirm.message.stop');
// Confirm logout using built-in alert
var alert:Alert = Alert.show(message, ResourceUtil.getInstance().getString('bbb.mainToolbar.recordBtn.confirm.title'), Alert.YES | Alert.NO, this, alertChangeRecordingStatus, null, Alert.YES);
_confirmationAlert = Alert.show(message, ResourceUtil.getInstance().getString('bbb.mainToolbar.recordBtn.confirm.title'), Alert.YES | Alert.NO, this, onCloseConfirmationDialog, null, Alert.YES);
var newX:Number = this.x;
var newY:Number = this.y + this.height + 5;
alert.validateNow();
alert.move(newX, newY);
_confirmationAlert.validateNow();
_confirmationAlert.move(newX, newY);
//Accessibility.updateProperties();
}
private function alertChangeRecordingStatus(e:CloseEvent):void {
private function confirmChangeRecordingStatus():void {
trace("Confirming recording status change!!!!");
// need to save the flag in case of any remote update on the recording status
recordingFlag = !this.selected;
showConfirmationAlert();
}
private function onCloseConfirmationDialog(e:CloseEvent):void {
hideConfirmationAlert();
// check to see if the YES button was pressed
if (e.detail==Alert.YES) {
doChangeRecordingStatus();
@ -116,6 +134,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
resourcesChanged();
this.enabled = UserManager.getInstance().getConference().amIModerator() && MeetingModel.getInstance().meeting.allowStartStopRecording;
if (! this.enabled) {
hideConfirmationAlert();
}
}
private function onRecordingStatusChanged(event:BBBEvent):void {