You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/03/02 10:12:51 UTC
svn commit: r1296096 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: src/base/
src/base/auth/ src/base/hibernate/ src/modules/conference/popups/
src/modules/conference/restricted/ src/test/backup_video/ swf10/base/
Author: sebawagner
Date: Fri Mar 2 09:12:51 2012
New Revision: 1296096
URL: http://svn.apache.org/viewvc?rev=1296096&view=rev
Log:
OPENMEETINGS-45 New Audio/Video Components Generally add some events, clean up code
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/loginDirect.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/loginScreen.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/loginWeb.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/test/backup_video/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1296096&r1=1296095&r2=1296096&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Fri Mar 2 09:12:51 2012
@@ -1651,115 +1651,26 @@
canvas.setExclusiveAudioAllowStatus(value.message[1]);
canvas.setAttribute("exclusiveAudioAllowStatus",value.message[1]);
} else if (value.message[0]=='applyForModeration'){
- //if (canvas.ismoderator) {
- if ($debug) Debug.write("Somebody wants the Moderation ",value.client);
-
- canvas.currentActivityList.addModerationRequest(value.client,value.message[1]);
-
- /*
- var txt = canvas.getLabelName(692) + " " +
- value.client.firstname + " " + value.client.lastname + " " +
- "[" + value.client.username + "] " +
- canvas.getLabelName(693);
-
- new lz.errorPopup(canvas,{
- labelid:691,error:txt
- });
- */
-
- //}
+ if ($debug) Debug.write("Somebody wants the Moderation ",value.client);
+ canvas.currentActivityList.addModerationRequest(value.client,value.message[1]);
} else if (value.message[0]=='applyForScreen'){
- //if (canvas.ismoderator) {
- if ($debug) Debug.write("Somebody wants to share/record Screen ",value.client);
-
- canvas.currentActivityList.addScreenRequest(value.client,value.message[1]);
-
- /*
- var txt = canvas.getLabelName(692) + " " +
- value.client.firstname + " " + value.client.lastname + " " +
- "[" + value.client.username + "] " +
- canvas.getLabelName(1070);
-
- new lz.errorPopup(canvas,{
- labelid:691,error:txt
- });
- */
- //}
+ if ($debug) Debug.write("Somebody wants to share/record Screen ",value.client);
+ canvas.currentActivityList.addScreenRequest(value.client,value.message[1]);
} else if (value.message[0]=='applyForRemote'){
- //if (canvas.ismoderator) {
- if ($debug) Debug.write("Somebody wants to remote control screen ",value.client);
-
- canvas.currentActivityList.addRemoteRequest(value.client,value.message[1]);
-
- /*
- var txt = canvas.getLabelName(692) + " " +
- value.client.firstname + " " + value.client.lastname + " " +
- "[" + value.client.username + "] " +
- canvas.getLabelName(1082);
-
- new lz.errorPopup(canvas,{
- labelid:691,error:txt
- });
- */
- //}
+ if ($debug) Debug.write("Somebody wants to remote control screen ",value.client);
+ canvas.currentActivityList.addRemoteRequest(value.client,value.message[1]);
} else if (value.message[0]=='applyForWhiteboard'){
- //if (canvas.ismoderator) {
- if ($debug) Debug.write("Somebody wants to draw on Whiteboard ",value.client);
-
- canvas.currentActivityList.addWhiteboardRequest(value.client,value.message[1]);
-
- /*
- var txt = canvas.getLabelName(692) + " " +
- value.client.firstname + " " + value.client.lastname + " " +
- "[" + value.client.username + "] " +
- canvas.getLabelName(694);
-
- new lz.errorPopup(canvas,{
- labelid:691,error:txt
- });
- */
-
- //}
+ if ($debug) Debug.write("Somebody wants to draw on Whiteboard ",value.client);
+ canvas.currentActivityList.addWhiteboardRequest(value.client,value.message[1]);
} else if (value.message[0]=='applyForA'){
- //if (canvas.ismoderator) {
if ($debug) Debug.write("Somebody wants to share A ",value.client);
-
canvas.currentActivityList.addAudioRequest(value.client,value.message[1]);
-
- //
- //new lz.errorPopup(canvas,{
- // labelid:691,error:txt
- // });
- //}
} else if (value.message[0]=='applyForAV'){
- //if (canvas.ismoderator) {
- if ($debug) Debug.write("Somebody wants to share AV ",value.client);
-
- canvas.currentActivityList.addAudioAndVideoRequest(value.client,value.message[1]);
-
- /*
- var txt = canvas.getLabelName(692) + " " +
- value.client.firstname + " " + value.client.lastname + " " +
- "[" + value.client.username + "] " +
- canvas.getLabelName(695);
-
- new lz.errorPopup(canvas,{
- labelid:691,error:txt
- });
- */
-
- //}
+ if ($debug) Debug.write("Somebody wants to share AV ",value.client);
+ canvas.currentActivityList.addAudioAndVideoRequest(value.client,value.message[1]);
} else if (value.message[0]=='hideActivityObj'){
- //if (canvas.ismoderator) {
if ($debug) Debug.write("Somebody wants to hideActivityObj ",value.client);
-
canvas.currentActivityList.hideActivityObj(value);
-
- //
- //new lz.errorPopup(canvas,{
- // labelid:691,error:txt
- // });
- //}
} else if (value.message[0]=='applyForMuteOn'){
canvas.currentActivityList.applyForMuteOn(value.client,value.message[1]);
} else if (value.message[0]=='applyForMuteOff'){
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1296096&r1=1296095&r2=1296096&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Fri Mar 2 09:12:51 2012
@@ -639,17 +639,9 @@
</handler>
</dataset>
-
-<method name="getSessionVars" args="">
- canvas.setAttribute('loadingmessage','loading session data');
- var d=getSessionVarsData;
- d.doRequest();
-</method>
-
-
-<method name="addBroswerTabHistory" args="value">
+<method name="addBrowserTabHistory" args="value">
<![CDATA[
- //Debug.write("addBroswerTabHistory: ",value);
+ //Debug.write("addBrowserTabHistory: ",value);
_browserhistory.addItem(value);
this.browserTabHistory.push(value);
]]>
@@ -657,6 +649,9 @@
<!---
@doc The function does compare the new moderator list with the old and prepares the list
+ the removeModeratorList is used in the performance optimized user list of the restricted
+ room type to re-render the list items only if really something has changed in any
+ of the user list items
-->
<method name="analyzeModerationList" args="newList">
<![CDATA[
@@ -673,12 +668,9 @@
for (var k=0;k<newList.length;k++) {
if (newList[k].publicSID == canvas.currentModeratorList[i].publicSID) {
-
canvas.currentModeratorList[i].found = true;
-
}
}
-
}
}
@@ -687,29 +679,19 @@
}
for (var k=0;k<newList.length;k++) {
-
if (canvas.currentModeratorList != null) {
for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
if (newList[k].publicSID == canvas.currentModeratorList[i].publicSID) {
-
newList[k].found = true;
-
}
-
}
}
-
}
for (var k=0;k<newList.length;k++) {
-
if (!newList[k].found) {
-
canvas.newModeratorList.push(newList[k]);
-
}
-
}
if (canvas.currentModeratorList != null) {
@@ -718,93 +700,62 @@
if (!canvas.currentModeratorList[i].found) {
canvas.removeModeratorList.push(canvas.currentModeratorList[i])
}
-
}
}
if ($debug) Debug.write("newModeratorList :: ",canvas.newModeratorList);
if ($debug) Debug.write("removeModeratorList :: ",canvas.removeModeratorList);
-
]]>
</method>
-<!--
-<method name="setModeratorName" args="mod">
- <![CDATA[
- this.moderatorName = mod;
- canvas._mymod.mymodText.setAttribute('text',canvas.getLabelName(98)+' '+this.moderatorName);
- if ($debug) Debug.write("canvas.moderatorStreamID==canvas.streamid",
- (canvas.moderatorStreamID==canvas.streamid),
- canvas.moderatorStreamID,canvas.streamid);
- if (canvas.moderatorStreamID==canvas.streamid){
- this.setAttribute('ismoderator',true);
- } else {
- this.setAttribute('ismoderator',false);
- }
- ]]>
-</method>
+<!---
+ Updates the "ismoderator" flag
+ the setAttribute method will broadcast an event to all event listeners that
+ did subscribe using the "onismoderator" handler with reference to canvas !
+ For example in the userlist's of the roomtypes
-->
-
<method name="updateModerationFlag">
<![CDATA[
if ($debug) Debug.write("updateModerationFlag",canvas.currentModeratorList);
-
var isCurrentModerator = false;
-
for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
var item = canvas.currentModeratorList[i];
-
-
if (canvas.publicSID == item.publicSID) {
isCurrentModerator = true;
}
-
}
-
this.setAttribute('ismoderator',isCurrentModerator);
-
]]>
</method>
-<!--
-var cItem = canvas._mymod.currentModerators.getItem(item.publicSID);
-
-if (cItem == null) {
- canvas._mymod.currentModerators.addItem(item.firstname + ' ' + item.lastname,item.publicSID);
-} else {
- if ($debug) Debug.warn("Already Moderator in Combobox List");
-}
+<!---
+ Checks if a certain publicSID is a moderator
-->
-
-
<method name="getIsModeratorByPublicSID" args="publicSID">
<![CDATA[
-
- //if ($debug) Debug.write("getIsModeratorByPublicSID ",publicSID);
-
for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
var item = canvas.currentModeratorList[i];
-
- //if ($debug) Debug.write("publicSID ? item.publicSID ",publicSID,item.publicSID);
-
if (publicSID == item.publicSID) {
return true;
}
}
-
return false;
]]>
</method>
-
+<!---
+ Load the invitation window
+ -->
<method name="doAction" args="action">
if (action == "invitation") {
new lz.inviteMainWindow(canvas.main_content._content.inner);
}
</method>
+<!---
+ Sets the flags isAllowedToDraw, isAllowedToScreenShare, isAllowedToRemoteControl
+ and broadcasts the three rights to SWF10 container
+ -->
<method name="setDrawAllowStatus" args="roomClientObj">
<![CDATA[
if ($debug) Debug.write("drawAllowStatus changes ###### ");
@@ -812,15 +763,21 @@ if (cItem == null) {
canvas.setAttribute("isAllowedToDraw",roomClientObj.canDraw);
canvas.setAttribute("isAllowedToScreenShare",roomClientObj.canShare);
canvas.setAttribute("isAllowedToRemoteControl",roomClientObj.canRemote);
+ canvas.lc.send(canvas.vid_lc_name, "setDrawAllowStatus", roomClientObj.canDraw, roomClientObj.canShare, roomClientObj.canRemote);
}
]]>
</method>
+<!---
+ Sets the flag for the isAllowedToGiveExclusiveAudio status and broadcasts it to the
+ SWF10 container
+ -->
<method name="setExclusiveAudioAllowStatus" args="roomClientObj">
<![CDATA[
if ($debug) Debug.write("giveExclusiveAudioStatus changes ###### ");
if (roomClientObj.publicSID==canvas.publicSID) {
canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
+ canvas.lc.send(canvas.vid_lc_name, "setExclusiveAudioAllowStatus", roomClientObj.canGiveAudio);
}
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx?rev=1296096&r1=1296095&r2=1296096&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx Fri Mar 2 09:12:51 2012
@@ -23,8 +23,6 @@
<resource name="warning_icon_rsc" src="resources/messagebox_warning.png" />
<include href="rpcerrorDialog.lzx" />
- <include href="loginScreen.lzx" />
- <include href="loginWeb.lzx" />
<include href="errorPopup.lzx" />
<include href="messageWin.lzx" />
<include href="headerMenu.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1296096&r1=1296095&r2=1296096&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx Fri Mar 2 09:12:51 2012
@@ -154,7 +154,6 @@
} else {
new lz.labelerrorPopup(canvas,{errorlabelid:682});
}
- //parent.parent.setCanDraw.doCall();
}
]]>
</handler>
@@ -173,7 +172,6 @@
if ($debug) Debug.write("Do Add It");
hib.addModerator.publicSIDOfNewModerator = parent.parent.parent.refObj.publicSID;
hib.addModerator.doCall();
- //parent.parent.setCanDraw.doCall();
}
]]>
</handler>
@@ -194,7 +192,6 @@
canvas.thishib.setCanDraw.publicSID = parent.parent.parent.refObj.publicSID;
canvas.thishib.setCanDraw.canDraw = false;
canvas.thishib.setCanDraw.doCall();
- //parent.parent.setCanDraw.doCall();
}
]]>
</handler>
@@ -210,7 +207,6 @@
canvas.thishib.setCanDraw.publicSID = parent.parent.parent.refObj.publicSID;
canvas.thishib.setCanDraw.canDraw = true;
canvas.thishib.setCanDraw.doCall();
- //parent.parent.setCanDraw.doCall();
}
</handler>
<labelTooltip labelid="611" />
@@ -278,8 +274,6 @@
resource="av_allow_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("ALLOW: ",parent.parent.parent.refObj.publicSID);
- //var myvideocontainer = canvas._videocontainer.getNewVideoObject(parent.parent.refObj.publicSID);
- //myvideocontainer.resetValues();
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = parent.parent.parent.refObj.publicSID;
canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
canvas.thishib.setBroadCastingFlag.doCall();
@@ -290,8 +284,6 @@
<miniIcons name="_denyDevice" x="80" width="40" height="16" resource="av_deny_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("ALLOW: ",parent.parent.parent.refObj.publicSID);
- //var myvideocontainer = canvas._videocontainer.getNewVideoObject(parent.parent.refObj.publicSID);
- //myvideocontainer.resetValues();
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = parent.parent.parent.refObj.publicSID;
canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = false;
canvas.thishib.setBroadCastingFlag.doCall();
@@ -302,11 +294,7 @@
<miniIcons name="_muteDevice" x="120" width="16" height="16" resource="mute_btn_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("mute: ",parent.parent.parent.refObj.publicSID);
- //canvas.thishib.giveExclusiveAudio.publicSID = parent.parent.parent.refObj.publicSID;
- //canvas.thishib.giveExclusiveAudio.doCall();
-
canvas.thishib.switchMicMuted.setMute(parent.parent.parent.refObj.publicSID,true);
-
</handler>
<labelTooltip labelid="1384" />
</miniIcons>
@@ -315,11 +303,7 @@
showhandcursor="true" visibility="hidden">
<handler name="onclick">
if ($debug) Debug.write("unmute: ",parent.parent.parent.refObj.publicSID);
- //canvas.thishib.giveExclusiveAudio.publicSID = parent.parent.parent.refObj.publicSID;
- //canvas.thishib.giveExclusiveAudio.doCall();
-
canvas.thishib.switchMicMuted.setMute(parent.parent.parent.refObj.publicSID,false);
-
</handler>
<labelTooltip labelid="1385" />
</miniIcons>
@@ -388,7 +372,6 @@
<netparam><method name="getValue"> return parent.publicSID; </method></netparam>
<handler name="ondata" args="value">
if ($debug) Debug.write("kickUserByPublicSID: ",value);
- //this.parent.destroy();
</handler>
</netRemoteCallHib>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1296096&r1=1296095&r2=1296096&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx Fri Mar 2 09:12:51 2012
@@ -477,7 +477,6 @@
<handler name="onismoderator" reference="canvas" args="m">
if ($debug) Debug.write("###### ismoderator ",m);
<![CDATA[
- //this.isMod = canvas.getIsModeratorByPublicSID(this.refObj.publicSID);
this.updateIcons();
]]>
</handler>
@@ -556,7 +555,6 @@
//search for the user and update its exclusiveAudioStatusIcon
var vList = parent._table._innerlist._inn._inn.subviews;
for (var i=0;i<vList.length;i++) {
- //vList[i].updateIconByMod();
if (vList[i].refObj.publicSID == rclObject.publicSID) {
vList[i].refObj.canGiveAudio = rclObject.canGiveAudio;
vList[i].canGiveAudio = rclObject.canGiveAudio;
@@ -568,7 +566,6 @@
var vList = parent._table.renderList;
for (var i=0;i<vList.length;i++) {
- //vList[i].updateIconByMod();
if (vList[i].publicSID == rclObject.publicSID) {
parent._table.renderList[i].canGiveAudio = rclObject.canGiveAudio;
break;
@@ -593,10 +590,8 @@
//search for the user and update its drawStatusIcon
var vList = parent._table._innerlist._inn._inn.subviews;
for (var i=0;i<vList.length;i++) {
- //vList[i].updateIconByMod();
if (vList[i].refObj.publicSID == userObject.publicSID) {
vList[i].isBroadcasting = userObject.isBroadcasting;
- //vList[i].updateIconByMod();
vList[i].updateModeratorIcons();
break;
}
@@ -604,7 +599,6 @@
var vList = parent._table.renderList;
for (var i=0;i<vList.length;i++) {
- //vList[i].updateIconByMod();
if (vList[i].publicSID == userObject.publicSID) {
parent._table.renderList[i].isBroadcasting = userObject.isBroadcasting;
break;
@@ -620,7 +614,6 @@
if ($debug) Debug.write(" :: updateIcons :: ");
- //var vList = parent._table.renderList;
for (var i=0;i<parent._table.renderList.length;i++) {
for (var k=0;k<canvas.newModeratorList.length;k++) {
@@ -667,13 +660,6 @@
}
- //var vList = parent._table._innerlist._inn._inn.subviews;
-
- //for (var i=0;i<vList.length;i++) {
- // vList[i].updateIconByMod();
- // vList[i].updateModeratorIcons();
- //}
-
parent._applyAndStatusIcons.updateIcons();
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1296096&r1=1296095&r2=1296096&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx Fri Mar 2 09:12:51 2012
@@ -47,9 +47,18 @@
-->
<attribute name="screenSharingDialogContainer" value="null" />
- <attribute name="isAllowedToRemoteControl" value="true" type="boolean" />
+ <!--
+ this value indicates if this user is allowed to draw to the Whiteboard
+ If this user is currently Moderator => he ALWAYS can draw to whiteboard
+ even if this isAllowedToDraw == false
+ -->
+ <attribute name="isAllowedToDraw" value="false" type="boolean" />
+
+ <attribute name="isAllowedToScreenShare" value="false" type="boolean" />
+
+ <attribute name="isAllowedToRemoteControl" value="false" type="boolean" />
- <attribute name="ismoderator" value="true" type="boolean" />
+ <attribute name="ismoderator" value="false" type="boolean" />
<attribute name="isInterview" value="false" type="boolean" />