Author: solomax
Date: Wed Jan 11 09:40:45 2017
New Revision: 1778261
URL: http://svn.apache.org/viewvc?rev=1778261&view=rev
Log:
[OPENMEETINGS-1376] video-only window being displayed as expected
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1778261&r1=1778260&r2=1778261&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Wed Jan 11 09:40:45 2017
@@ -809,6 +809,8 @@
case "av":
videoview.broadcast(canvas.currentClient.broadCastID, _camera, _micro);
myvideocontainer.setAttribute("visible", true);
+
myvideocontainer._toolbar._mute.setAttribute("visible", true);
+
myvideocontainer._toolbar._volume.setAttribute("visible", true);
if(!canvas.isInterview &&
myvideocontainer.minimized) {
myvideocontainer.reminimize();
}
@@ -816,6 +818,8 @@
case "a":
videoview.broadcast(canvas.currentClient.broadCastID, null, _micro);
myvideocontainer.setAttribute("visible", true);
+
myvideocontainer._toolbar._mute.setAttribute("visible", true);
+
myvideocontainer._toolbar._volume.setAttribute("visible", true);
if(!canvas.isInterview &&
!myvideocontainer.minimized) {
myvideocontainer.minimize();
}
@@ -823,6 +827,8 @@
case "v":
videoview.broadcast(canvas.currentClient.broadCastID, _camera, null);
myvideocontainer.setAttribute("visible", true);
+
myvideocontainer._toolbar._mute.setAttribute("visible", false);
+
myvideocontainer._toolbar._volume.setAttribute("visible", false);
if(!canvas.isInterview &&
myvideocontainer.minimized) {
myvideocontainer.reminimize();
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx?rev=1778261&r1=1778260&r2=1778261&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
Wed Jan 11 09:40:45 2017
@@ -471,12 +471,19 @@
</view>
</view>
+ <method name="allowedExclusiveAudio">
+ <![CDATA[
+ return (canvas.ismoderator ||
canvas.isAllowedToGiveExclusiveAudio)
+ &&
this.clientVars.avsettings.indexOf('a') > -1;
+ ]]>
+ </method>
+
<handler name="onmouseover">
<![CDATA[
if (this.isInterview || this.minimized) {
return;
}
- if (canvas.ismoderator ||
canvas.isAllowedToGiveExclusiveAudio) {
+ if (allowedExclusiveAudio()) {
this._giveExclusiveAudioView._micButton._toolTipTextExclusiveAudio.doonmouseover();
this._giveExclusiveAudioView.setAttribute("visible", true);
}
@@ -488,18 +495,18 @@
if (this.isInterview || this.minimized) {
return;
}
-
this._giveExclusiveAudioView._micButton._toolTipTextExclusiveAudio.cleanHolder();
- this._giveExclusiveAudioView.setAttribute("visible",
false);
+ if (allowedExclusiveAudio()) {
+
this._giveExclusiveAudioView._micButton._toolTipTextExclusiveAudio.cleanHolder();
+
this._giveExclusiveAudioView.setAttribute("visible", false);
+ }
]]>
</handler>
<handler name="onclick">
<![CDATA[
- if (canvas.ismoderator ||
canvas.isAllowedToGiveExclusiveAudio) {
+ if (allowedExclusiveAudio()) {
this._giveExclusiveAudioView._micButton._toolTipTextExclusiveAudio.cleanHolder();
this.confirmExclusiveAudio();
- } else {
- new
lz.labelerrorPopup(canvas,{errorlabelid:1478});
}
]]>
</handler>
