diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml index 39278a39d635051b047bd8cc0f38ab8b918dc15e..0b29af6ab3102ca0ce8e1127a6a4e03a1822e0ec 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml @@ -37,9 +37,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. import org.bigbluebutton.main.model.users.events.KickUserEvent; import org.bigbluebutton.main.model.users.events.RoleChangeEvent; import org.bigbluebutton.modules.chat.model.ChatOptions; + import org.bigbluebutton.modules.users.model.UsersOptions; import org.bigbluebutton.modules.videoconf.model.VideoConfOptions; import org.bigbluebutton.util.i18n.ResourceUtil; - import org.bigbluebutton.modules.users.model.UsersOptions; public var sharerUserID:String; [Bindable] @@ -70,19 +70,25 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. showControlButtons(); } - private function onKickUserClicked():void { + private function onKickUserClicked(event:Event):void { + event.stopImmediatePropagation(); + var gd:Dispatcher = new Dispatcher(); gd.dispatchEvent(new KickUserEvent(sharerUserID)); } - private function onPrivateChatClicked():void { + private function onPrivateChatClicked(event:Event):void { + event.stopImmediatePropagation(); + var e:CoreEvent = new CoreEvent(EventConstants.START_PRIVATE_CHAT); e.message.chatWith = sharerUserID; var gd:Dispatcher = new Dispatcher(); gd.dispatchEvent(e); } - private function onSwitchPresenterClicked():void { + private function onSwitchPresenterClicked(event:Event):void { + event.stopImmediatePropagation(); + var e:RoleChangeEvent = new RoleChangeEvent(RoleChangeEvent.ASSIGN_PRESENTER); e.userid = sharerUserID; e.username = UsersUtil.getUserName(sharerUserID); @@ -90,7 +96,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. gd.dispatchEvent(e); } - private function onMuteUnmuteClicked():void { + private function onMuteUnmuteClicked(event:Event):void { + event.stopImmediatePropagation(); + var bu:BBBUser = UsersUtil.getUser(sharerUserID); if (bu != null) { var e:VoiceConfEvent = new VoiceConfEvent(VoiceConfEvent.MUTE_USER); @@ -197,15 +205,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. } ]]> </mx:Script> - <mx:Button id="muteUnmuteBtn" visible="false" click="onMuteUnmuteClicked()" + <mx:Button id="muteUnmuteBtn" visible="false" click="onMuteUnmuteClicked(event)" width="{BUTTONS_SIZE}" height="{BUTTONS_SIZE}" styleName="videoUnmutedButtonStyle"/> <mx:Spacer width="2"/> - <mx:Button id="switchPresenter" visible="false" click="onSwitchPresenterClicked()" + <mx:Button id="switchPresenter" visible="false" click="onSwitchPresenterClicked(event)" width="{BUTTONS_SIZE}" height="{BUTTONS_SIZE}" styleName="videoSwitchPresenterButtonStyle"/> <mx:Spacer width="2"/> - <mx:Button id="ejectUserBtn" visible="false" click="onKickUserClicked()" + <mx:Button id="ejectUserBtn" visible="false" click="onKickUserClicked(event)" width="{BUTTONS_SIZE}" height="{BUTTONS_SIZE}" styleName="videoEjectUserButtonStyle"/> <mx:Spacer width="2"/> - <mx:Button id="privateChatBtn" click="onPrivateChatClicked()" + <mx:Button id="privateChatBtn" click="onPrivateChatClicked(event)" width="{BUTTONS_SIZE}" height="{BUTTONS_SIZE}" styleName="videoPrivateChatButtonStyle"/> </mx:HBox>