You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/04/01 11:21:41 UTC
svn commit: r1463116 - in /openmeetings:
branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Author: solomax
Date: Mon Apr 1 09:21:41 2013
New Revision: 1463116
URL: http://svn.apache.org/r1463116
Log:
[OPENMEETINGS-587] "take exclusive audio" by hotkey is fixed
Modified:
openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Modified: openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1463116&r1=1463115&r2=1463116&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Mon Apr 1 09:21:41 2013
@@ -108,11 +108,7 @@
if (canvas.GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) {
if (canvas.ismoderator || canvas.isAllowedToGiveExclusiveAudio) {
- var obj = canvas._videocontainer._participants.getUserListItemByPublicSID(canvas.publicSID);
- if (null != obj) {
- obj._giveExclusiveAudioView._micButton.onclick.sendEvent();
- }
- return;
+ canvas.thishib.giveExclusiveAudio.setExclusiveAudio(canvas.publicSID);
} else {
new lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-54});
}
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1463116&r1=1463115&r2=1463116&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Mon Apr 1 09:21:41 2013
@@ -108,11 +108,7 @@
if (canvas.GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) {
if (canvas.ismoderator || canvas.isAllowedToGiveExclusiveAudio) {
- var obj = canvas._videocontainer._participants.getUserListItemByPublicSID(canvas.publicSID);
- if (null != obj) {
- obj._giveExclusiveAudioView._micButton.onclick.sendEvent();
- }
- return;
+ canvas.thishib.giveExclusiveAudio.setExclusiveAudio(canvas.publicSID);
} else {
new lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-54});
}