Author: solomax
Date: Wed Dec 21 04:06:51 2016
New Revision: 1775370
URL: http://svn.apache.org/viewvc?rev=1775370&view=rev
Log:
[OPENMEETINGS-1454] autoVideoSelect works in interview room
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/modules/conference/whiteboard/interviewWhiteboard.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=1775370&r1=1775369&r2=1775370&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 Dec 21 04:06:51 2016
@@ -78,7 +78,7 @@
<method name="createVideoObject" args="publicSID, isBroadcasting,
interviewPodId, object">
if($debug) Debug.info("createVideoObject, publicSID:
",publicSID, "isBroadcasting: ", isBroadcasting, "object", object);
var vidContainer = getVideoObjectByPublicSID(publicSID);
- if(vidContainer == null) {
+ if (vidContainer == null) {
vidContainer = isBroadcasting ?
this.getNewVideoObject(publicSID) : this.getNewVideoObjectByPos(publicSID);
vidContainer.publicSID = publicSID;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/interviewWhiteboard.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/interviewWhiteboard.lzx?rev=1775370&r1=1775369&r2=1775370&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/interviewWhiteboard.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/interviewWhiteboard.lzx
Wed Dec 21 04:06:51 2016
@@ -22,9 +22,27 @@
<class name="interviewWhiteboard" extends="view" clip="true">
<handler name="oninit">
+ <![CDATA[
if ($debug) Debug.write(":: interviewWhiteboard :: oninit :: ",
canvas.commonVideoViewContent);
canvas._drawarea = this;
this.reloadStatus();
+ if (canvas.currentRoomObj.autoVideoSelect) {
+ var cl = canvas.currentClient;
+ if (!cl.interviewPodId && (cl.isMod ||
cl.isSuperModerator || cl.canDraw)) {
+ var vcount =
canvas.commonVideoViewContent.subviews.length;
+ var pod = null;
+ if (vcount == 1) {
+ var busypod =
canvas.commonVideoViewContent.subviews[0].interviewPodId;
+ pod = (busypod == 1 ? 2 : 1);
+ } else if (vcount == 0) {
+ pod = 1;
+ }
+ if (!!pod) {
+ _videoviewcontent["interviewVideoBox" +
pod].sendConfirmation(canvas.publicSID);
+ }
+ }
+ }
+ ]]>
</handler>
<handler name="onopenWhiteBoard" >
@@ -41,14 +59,14 @@
<netRemoteCallHib name="getInterviewRecordingStatus"
funcname="getInterviewRecordingStatus"
remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
- <![CDATA[
- if ($debug)
Debug.write("getInterviewRecordingStatus: ",value);
- if (value) {
-
parent._recStarted.setAttribute("visibility","visible");
- } else {
-
parent._recStarted.setAttribute("visibility","hidden");
- }
- ]]>
+ <![CDATA[
+ if ($debug) Debug.write("getInterviewRecordingStatus:
",value);
+ if (value) {
+
parent._recStarted.setAttribute("visibility","visible");
+ } else {
+
parent._recStarted.setAttribute("visibility","hidden");
+ }
+ ]]>
</handler>
</netRemoteCallHib>
