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

Merge remote-tracking branch 'RafaFP/fix-1722' into mconf-live0.7.3 (refs #1722)

Browse Source
This commit is contained in:
Felipe Cecagno 2015-10-23 09:50:47 -02:00
commit 30caf8b0fb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
View File

@ -42,6 +42,7 @@
import org.bigbluebutton.core.events.LockControlEvent;
import org.bigbluebutton.core.events.VoiceConfEvent;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.vo.LockSettingsVO;
import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.main.model.users.events.ChangeMyRole;
@ -92,14 +93,14 @@
}
private function onRollOver(e:UsersRollEvent):void{
if (moderator && (e.userID == data.userID)) {
if ((moderator || UsersUtil.isMe(e.userID)) && (e.userID == data.userID)) {
rolledOver = true;
updateButtons();
}
}
private function onRollOut(e:UsersRollEvent):void{
if (moderator && rolledOver) {
if ((moderator || UsersUtil.isMe(e.userID)) && rolledOver) {
rolledOver = false;
updateButtons();
}
@ -115,7 +116,7 @@
}
private function refreshRole(amIModerator:Boolean):void {
lockBtn.enabled = muteBtn.enabled = settingsBtn.enabled = moderator = amIModerator;
lockBtn.enabled = settingsBtn.enabled = moderator = amIModerator;
}
private function muteMouseOverHandler():void {
@ -199,6 +200,7 @@
muteImg.includeInLayout = !rolledOver;
muteBtn.visible = rolledOver;
muteBtn.includeInLayout = rolledOver;
muteBtn.enabled = true;
if(data.talking && !rolledOver){
muteImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];