Author: solomax
Date: Wed Dec 25 08:11:14 2013
New Revision: 1553361
URL: http://svn.apache.org/r1553361
Log:
[OPENMEETINGS-696] choose device is available for restricted room
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1553361&r1=1553360&r2=1553361&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Wed Dec 25 08:11:14 2013
@@ -694,19 +694,21 @@
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
- parent.getTimeZones.doCall();
+ parent.getTimeZones.doCall(); // this is very long call let it be
async
+ parent.getGeneralOptions.doCall();
</handler>
</netRemoteCallHib>
<netRemoteCallHib name="getTimeZones" funcname="xmlcrm.getTimeZones"
dataobject="timeZoneSet">
<handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("getTimeZones: ",value);
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("getTimeZones: ",value);
if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.setProgress();
- }
- parent.getGeneralOptions.doCall();
- </handler>
+ canvas.thishib.loaderVar.setProgress();
+ }
+ canvas.inviteMainWindow = new
lz.inviteMainWindow(canvas);
+ if($debug) Debug.write("create invitationWindow:
",canvas.inviteMainWindow);
+ </handler>
</netRemoteCallHib>
<netRemoteCallHib name="getGeneralOptions"
funcname="xmlcrm.getGeneralOptions">
@@ -904,7 +906,7 @@
//if ($debug) Debug.write("throw event to drawarea:
",canvas.moderatorStreamID,canvas.ismoderator);
- if (this.parent.modus == "conference"){
+ if (this.parent.modus == "conference") {
if ($debug)
Debug.write("############## showDevicePopUp");
canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
}
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1553361&r1=1553360&r2=1553361&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Wed Dec
25 08:11:14 2013
@@ -638,10 +638,6 @@
//and if roomtype_id == 3 we will not show any *There is no Moderator*
Warning Dialog
canvas.currentRoomObject = roomObj;
- var inviteMainWindow = new lz.inviteMainWindow(canvas);
- canvas.inviteMainWindow = inviteMainWindow;
- if($debug) Debug.write("create invitationWindow:
",canvas.inviteMainWindow);
-
hib.currentroomid = roomId;
if (roomObj!=null){
if (roomTypeId==1){
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1553361&r1=1553360&r2=1553361&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
Wed Dec 25 08:11:14 2013
@@ -31,6 +31,7 @@
this.isSuperModerator = parent.parent.isSuperModerator;
if ($debug) Debug.write(" :: moderationMiniIconRestricted :.
",this.isMod);
+ var refObj = parent.parent.refObj;
if (this.isMod) {
this._isMod.setAttribute("visibility","visible");
@@ -47,7 +48,7 @@
this._canDraw._text.setAttribute("text",canvas.getLabelName(681));
this._canDrawModerator.setAttribute("visibility","hidden");
} else {
- if (parent.parent.refObj.canDraw) {
+ if (refObj != null && refObj.canDraw) {
this._canDraw.setAttribute("visibility","visible");
this._canDraw.isActive = true;
this._canDraw.setAttribute("showhandcursor",true);
@@ -80,9 +81,9 @@
this._denyExclusiveAudio.setAttribute("visibility","hidden");
} else {
- if ($debug) Debug.write("parent.parent.refObj.canShare
:: ",parent.parent.refObj.canShare);
+ if ($debug) Debug.write("refObj.canShare :: ", (refObj
!= null && refObj.canShare));
- if (parent.parent.refObj.canShare) {
+ if (refObj != null && refObj.canShare) {
this._allowScreen.setAttribute("visibility","visible");
this._allowScreen.isActive = true;
this._allowScreen.setAttribute("showhandcursor",true);
@@ -93,7 +94,7 @@
this._denyScreen.setAttribute("visibility","visible");
}
- if (parent.parent.refObj.canRemote) {
+ if (refObj != null && refObj.canRemote) {
this._allowRemote.setAttribute("visibility","visible");
this._allowRemote.isActive = true;
this._allowRemote.setAttribute("showhandcursor",true);
@@ -104,7 +105,7 @@
this._denyRemote.setAttribute("visibility","visible");
}
- if (parent.parent.refObj.canGiveAudio) {
+ if (refObj != null && refObj.canGiveAudio) {
this._allowExclusiveAudio.setAttribute("visibility","visible");
this._allowExclusiveAudio.isActive = true;
this._allowExclusiveAudio.setAttribute("showhandcursor",true);
@@ -116,7 +117,7 @@
}
}
- if (parent.parent.refObj.isBroadcasting) {
+ if (refObj != null && refObj.isBroadcasting) {
this._allowDevice.setAttribute("visibility","hidden");
this._denyDevice.setAttribute("visibility","visible");
} else {
@@ -124,9 +125,9 @@
this._denyDevice.setAttribute("visibility","hidden");
}
- if ($debug) Debug.write("Set micMuted
",parent.parent.refObj.micMuted);
+ if ($debug) Debug.write("Set micMuted ", (refObj != null &&
refObj.micMuted));
- if (parent.parent.refObj.micMuted) {
+ if (refObj != null && refObj.micMuted) {
this._muteDevice.setAttribute("visibility","hidden");
this._unMuteDevice.setAttribute("visibility","visible");
} else {
@@ -136,7 +137,7 @@
this._start_private_chat_rsc.setAttribute('visible'
, (canvas.currentRoomObj.hideChat == null ||
!canvas.currentRoomObj.hideChat)
- && parent.parent.refObj.publicSID !=
canvas.publicSID);
+ && (refObj != null && refObj.publicSID !=
canvas.publicSID));
]]>
</handler>
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1553361&r1=1553360&r2=1553361&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Wed Dec 25 08:11:14 2013
@@ -83,7 +83,7 @@
if($debug)
Debug.info("createEditRecordStream,",syncUpdate,isInterview,interviewPodId);
if (canvas.inner.editRecordStream != null)
canvas.inner.editRecordStream.destroy();
- new lz.editRecordStreamSWF10(canvas.inner, {
+ new lz.editRecordStreamSWF10(canvas.inner, {
name:"editRecordStream",
isSyncUpdate:syncUpdate,
isInterview:isInterview,
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1553361&r1=1553360&r2=1553361&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Wed Dec 25 08:11:14 2013
@@ -150,7 +150,7 @@
is true and the box will close without asking for device settings.
-->
<method name="checkDeviceSettingsRememberStatus">
- <![CDATA[
+ <![CDATA[
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
var save = g["savecamdata"];
@@ -160,11 +160,15 @@
//In case the user presses the Sync Button this box should
//not close automatically and do the user-prefered values
+ if (canvas.currentRoomObject.roomtype.roomtypes_id == 3) {
+ //restricted room
+ return null;
+ }
if(save && !this.isSyncUpdate && this.checkLocalDataComplete())
{
return g;
}
return null;
- ]]>
+ ]]>
</method>
<!--
