From 69c9fc947e80d92b2f352732ce4ceb3054a28f3d Mon Sep 17 00:00:00 2001 From: RafaFP Date: Sun, 9 Aug 2015 17:36:31 +0000 Subject: [PATCH 1/2] Viewer can now mute/unmute his microphone from the users window. refs #1722 --- .../modules/users/views/MediaItemRenderer.mxml | 11 ++++++++++- .../modules/users/views/UsersWindow.mxml | 2 +- .../grails-app/conf/bigbluebutton.properties | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml index 0d4bd25c0e..2c15b6d73e 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml @@ -96,6 +96,10 @@ rolledOver = true; updateButtons(); } + else if (UserManager.getInstance().getConference().amIThisUser(e.userID) && (e.userID == data.userID)) { + rolledOver = true; + updateButtons(); + } } private function onRollOut(e:UsersRollEvent):void{ @@ -103,6 +107,10 @@ rolledOver = false; updateButtons(); } + else if (UserManager.getInstance().getConference().amIThisUser(e.userID) && rolledOver) { + rolledOver = false; + updateButtons(); + } } private function onChangeMyRole(e:ChangeMyRole):void { @@ -115,7 +123,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 +207,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)]; diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml index fcea34aa6c..ef90e54221 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml @@ -473,7 +473,7 @@ switch(keyCombos[keyPress]) { case FOCUS_USERS_LIST: remoteFocusUsers(); - break; + break; case MAKE_PRESENTER: remoteMakePresenter(); break; diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties index 27ba1cce7d..a1c25f2fb3 100755 --- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties +++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties @@ -125,7 +125,7 @@ allowStartStopRecording=true #---------------------------------------------------- # This URL is where the BBB client is accessible. When a user sucessfully # enters a name and password, she is redirected here to load the client. -bigbluebutton.web.serverURL=http://192.168.23.3 +bigbluebutton.web.serverURL=http://10.0.3.221 #---------------------------------------------------- # Assign URL where the logged-out participant will be redirected after sign-out. @@ -148,7 +148,7 @@ defaultConfigURL=${bigbluebutton.web.serverURL}/client/conf/config.xml apiVersion=0.9 # Salt which is used by 3rd-party apps to authenticate api calls -securitySalt=778818ef77e83a9b1cab2fd7c908e975 +securitySalt=a318ef0687e2d36442905c156b380f9e # Directory where we drop the .done file recordStatusDir=/var/bigbluebutton/recording/status/recorded From cd2821993b20e52f43937100fb1c14dea4918d2d Mon Sep 17 00:00:00 2001 From: RafaFP Date: Tue, 11 Aug 2015 13:38:26 +0000 Subject: [PATCH 2/2] Viewer can now mute/unmute his microphone from the users window. Improved code and reverted .properties to the correct file. refs #1722 --- .../modules/users/views/MediaItemRenderer.mxml | 15 ++++----------- .../modules/users/views/UsersWindow.mxml | 2 +- .../grails-app/conf/bigbluebutton.properties | 4 ++-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml index 2c15b6d73e..bcc953d1c7 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml @@ -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,25 +93,17 @@ } private function onRollOver(e:UsersRollEvent):void{ - if (moderator && (e.userID == data.userID)) { - rolledOver = true; - updateButtons(); - } - else if (UserManager.getInstance().getConference().amIThisUser(e.userID) && (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(); } - else if (UserManager.getInstance().getConference().amIThisUser(e.userID) && rolledOver) { - rolledOver = false; - updateButtons(); - } } private function onChangeMyRole(e:ChangeMyRole):void { @@ -123,7 +116,7 @@ } private function refreshRole(amIModerator:Boolean):void { - lockBtn.enabled = settingsBtn.enabled = moderator = amIModerator; + lockBtn.enabled = settingsBtn.enabled = moderator = amIModerator; } private function muteMouseOverHandler():void { diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml index ef90e54221..fcea34aa6c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml @@ -473,7 +473,7 @@ switch(keyCombos[keyPress]) { case FOCUS_USERS_LIST: remoteFocusUsers(); - break; + break; case MAKE_PRESENTER: remoteMakePresenter(); break; diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties index a1c25f2fb3..27ba1cce7d 100755 --- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties +++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties @@ -125,7 +125,7 @@ allowStartStopRecording=true #---------------------------------------------------- # This URL is where the BBB client is accessible. When a user sucessfully # enters a name and password, she is redirected here to load the client. -bigbluebutton.web.serverURL=http://10.0.3.221 +bigbluebutton.web.serverURL=http://192.168.23.3 #---------------------------------------------------- # Assign URL where the logged-out participant will be redirected after sign-out. @@ -148,7 +148,7 @@ defaultConfigURL=${bigbluebutton.web.serverURL}/client/conf/config.xml apiVersion=0.9 # Salt which is used by 3rd-party apps to authenticate api calls -securitySalt=a318ef0687e2d36442905c156b380f9e +securitySalt=778818ef77e83a9b1cab2fd7c908e975 # Directory where we drop the .done file recordStatusDir=/var/bigbluebutton/recording/status/recorded