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 2015/11/19 19:31:48 UTC
svn commit: r1715233 - in
/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf: ./ base/
base/components/turnoverlist/ base/hibernate/ base/remote/
modules/conference/flexibleConferenceRoom/
modules/conference/flexibleConferenceRoom/activitylis...
Author: solomax
Date: Thu Nov 19 18:31:47 2015
New Revision: 1715233
URL: http://svn.apache.org/viewvc?rev=1715233&view=rev
Log:
[OPENMEETINGS-1279] room looks better (still unusable)
Removed:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/logoutConfirm.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/baseContentListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewVideoBox.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTab.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/baseContentListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/baseContentListItem.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/baseContentListItem.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/baseContentListItem.lzx Thu Nov 19 18:31:47 2015
@@ -21,8 +21,7 @@
<library>
<!--- base class for the item list views-->
-<class name="baseContentListItem" extends="view"
- layout="axis:x;spacing:0" bgcolor="0xFFFFFF" >
+<class name="baseContentListItem" extends="view" layout="axis:x;spacing:0" bgcolor="0xFFFFFF" >
<attribute name="isselected" value="false" type="boolean"/>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx Thu Nov 19 18:31:47 2015
@@ -100,15 +100,10 @@ function quicklinkAct(action) {
function loadContent(obj,parentobj,preparentobj){
if($debug) Debug.write("FUNC/loadContent: ", obj);
- if (obj.action!="logout") {
- tempActionForNavi = {action: obj.action, params: obj.params};
- if (!clearStageContent()) {
- loadContentByTempActionForNavi();
- }
- } else {
- new lz.logoutConfirm(canvas,{objectsToClean: obj});
+ tempActionForNavi = {action: obj.action, params: obj.params};
+ if (!clearStageContent()) {
+ loadContentByTempActionForNavi();
}
-
}
function loadContentByTempActionForNavi(){
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Thu Nov 19 18:31:47 2015
@@ -381,36 +381,6 @@
]]>
</method>
- <netRemoteCallHib name="logoutUser" funcname="xmlcrm.logoutUser"
- remotecontext="$once{ canvas.thishib }" activeErrorHandler="true"
- isCallBackHandler="true">
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <handler name="sendCallBack">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("sendCallBack logoutUser: ");
- parent.initlanguageLoaded = false;
-
- var g = canvas.getUserData();
- g["username"] = '';
- g["userpass"] = '';
- g["userquality"] = null;
- g["usercolor"] = null;
- g["userlang"] = null;
- g["saveuserdata"]=false;
- g["storedSession"] = "";
- canvas.setUserData(g);
- canvas.setColorStyle(canvas.baseColorScheme);
-
- parent.userlang = -1;
- parent.setDefaultUserLanguage();
-
- parent.getLanguageByIdAndMax.start = 0;
- parent.getLanguageByIdAndMax.doCall();
- ]]>
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="setUsernameReconnect" funcname="setUsernameReconnect" remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return canvas.sessionId;</method></netparam>
<netparam><method name="getValue">return canvas.userId;</method></netparam>
@@ -482,7 +452,7 @@
canvas.showNickNameDialog = value.showNickNameDialog;
if ($debug) Debug.write("markSessionAsLogedIn9 ",canvas.showNickNameDialog);
- canvas.initroomid = value.room_id;
+ canvas.initroomid = value.roomId;
canvas.becomemoderator = value.becomemoderator;
canvas.showAudioVideoTest = value.showAudioVideoTest;
@@ -825,9 +795,9 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("addNewUser: ",value);
if(value.sipTransport) {
- canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
+ canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
} else {
- canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
+ canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
}
canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
</handler>
@@ -879,7 +849,7 @@
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("newStream: ",value);
- if (value == null || value.isScreenClient) {
+ if (value == null || value.screenClient) {
return;
}
canvas.commonVideoViewContent.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId,value.VWidth,value.VHeight);
@@ -893,7 +863,7 @@
if (value == null) {
return;
}
- if (value.isScreenClient) {
+ if (value.screenClient) {
if ($debug) Debug.write(" ondata closeStream: ",value.streamPublishName);
canvas.commonVideoViewContent.closeScreenSharing(value);
} else {
@@ -943,7 +913,7 @@
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("roomDisconnect: ",value);
- if (value == null || value.isScreenClient) {
+ if (value == null || value.screenClient) {
return;
}
if (canvas.currentBaseConferenceRoom != null && canvas.currentBaseConferenceRoom._chatPanelStrict != null) {
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx Thu Nov 19 18:31:47 2015
@@ -31,5 +31,4 @@
<include href="mainAttributes.lzx" />
<include href="mainDatasets.lzx" />
<include href="mainMethods.lzx" />
- <include href="logoutConfirm.lzx" />
</library>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx Thu Nov 19 18:31:47 2015
@@ -51,7 +51,7 @@
this._nc.proxyType = canvas.proxyType;
- var ok = this._nc.connect(src == "null" ? null : src, false); //isAVClient = false
+ var ok = this._nc.connect(src == "null" ? null : src, false); //avClient = false
if (this.debug) {
if($debug) Debug.write("*** debug ***");
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Thu Nov 19 18:31:47 2015
@@ -219,7 +219,7 @@
<method name="getVideoObjectFreePos" args="offsetLength,videoWidth,videoHeight">
<![CDATA[
var newx = 20;
- if (canvas.currentRoomObject.hideWhiteboard) {
+ if (canvas.currentRoomObj.hideWhiteboard) {
newx += SIDEPANEL_WIDTH;
}
var newy = 0;
@@ -246,7 +246,7 @@
}
if ((newx + videoWidth) >= canvas.width) {
newx = 20;
- if (canvas.currentRoomObject.hideWhiteboard) {
+ if (canvas.currentRoomObj.hideWhiteboard) {
newx += SIDEPANEL_WIDTH;
}
newy += 10;
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx Thu Nov 19 18:31:47 2015
@@ -294,7 +294,7 @@
<class name="activityList" y="${ parent.height - 200 }" x="0"
extends="basePropertyPanelWhiteboard" height="200"
width="$once{ parent.width-10 }" labelid="1363"
- visibility="${((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 'hidden':'visible')}">
+ visible="${ !canvas.currentRoomObj.activitiesHidden }">
<handler name="oninit">
canvas.currentActivityList = this;
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Thu Nov 19 18:31:47 2015
@@ -71,7 +71,7 @@
var r = this.roomobj;
r.currentusers = ''; //this might be huge list
- if (this.roomobj.isClosed) {
+ if (this.roomobj.closed) {
canvas.roomClosed();
}
@@ -83,9 +83,9 @@
canvas.setAttribute('naviHeightDelta',28);
if (this._chatPanelStrict) {
- var hideChat = this.roomobj.hideChat != null && this.roomobj.hideChat;
- this._chatPanelStrict.setAttribute('visible', !hideChat);
- if (hideChat) {
+ var chatHidden = this.roomobj.chatHidden;
+ this._chatPanelStrict.setAttribute('visible', !chatHidden);
+ if (chatHidden) {
this._chatPanelStrict.setAttribute('height', 28);
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx Thu Nov 19 18:31:47 2015
@@ -102,7 +102,7 @@
<participants name="_videocontainer" y="36"
width="$once{ parent.width-10 }"
- height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
+ height="${ parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
<activityList name="_activityList" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx Thu Nov 19 18:31:47 2015
@@ -66,7 +66,7 @@
<interviewUserList name="_videocontainer" y="36"
width="$once{ parent.width-10 }"
- height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
+ height="${ parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
<activityList name="_activityList" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx Thu Nov 19 18:31:47 2015
@@ -115,7 +115,7 @@
<restrictedUserList name="_participants" y="36"
width="$once{ parent.width-10 }"
- height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
+ height="${ parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
<activityList name="_activityList" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx Thu Nov 19 18:31:47 2015
@@ -187,9 +187,9 @@
]]>
</method>
- <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,roomId,formatedDate,position,color,object">
<![CDATA[
- if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
+ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,roomId,formatedDate);
if (canvas.publicSID != object.publicSID){
canvas.commonVideoViewContent.createVideoObject(object.publicSID, false, object.interviewPodId, object);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewVideoBox.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewVideoBox.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewVideoBox.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewVideoBox.lzx Thu Nov 19 18:31:47 2015
@@ -79,7 +79,7 @@
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = publicSID;
canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
- canvas.thishib.setBroadCastingFlag.canVideo = !canvas.currentRoomObj.isAudioOnly;
+ canvas.thishib.setBroadCastingFlag.canVideo = !canvas.currentRoomObj.audioOnly;
canvas.thishib.setBroadCastingFlag.interviewPodId = this.interviewPodId;
canvas.thishib.setBroadCastingFlag.doCall();
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx Thu Nov 19 18:31:47 2015
@@ -381,7 +381,7 @@
<miniIcons name="_start_private_chat_rsc" x="114" y = "2" width="16" height="16"
resource="start_private_chat_rsc" showhandcursor="true"
- visible="${ (canvas.currentRoomObj.hideChat == null || !canvas.currentRoomObj.hideChat) && parent.refObj.publicSID != canvas.publicSID }">
+ visible="${ (!canvas.currentRoomObj.chatHidden) && parent.refObj.publicSID != canvas.publicSID }">
<handler name="onclick">
var refObj = parent.refObj;
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx Thu Nov 19 18:31:47 2015
@@ -253,9 +253,9 @@
canvas.commonVideoViewContent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight);
</method>
- <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,roomId,formatedDate,position,color,object">
<![CDATA[
- if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
+ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,roomId,formatedDate);
if (canvas.publicSID != object.publicSID){
if ($debug) Debug.write("### initializeStreams createVideoObject: ", object);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx Thu Nov 19 18:31:47 2015
@@ -136,8 +136,7 @@
}
this._start_private_chat_rsc.setAttribute('visible'
- , (canvas.currentRoomObj.hideChat == null || !canvas.currentRoomObj.hideChat)
- && (refObj != null && refObj.publicSID != canvas.publicSID));
+ , (!canvas.currentRoomObj.chatHidden) && (refObj != null && refObj.publicSID != canvas.publicSID));
]]>
</handler>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx Thu Nov 19 18:31:47 2015
@@ -236,9 +236,9 @@
]]>
</method>
- <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,roomId,formatedDate,position,color,object">
<![CDATA[
- if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
+ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,roomId,formatedDate);
if (canvas.publicSID != object.publicSID){
canvas.commonVideoViewContent.createVideoObject(object.publicSID, false, -1, object);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Thu Nov 19 18:31:47 2015
@@ -135,7 +135,7 @@
if (canvas._chatcontent != null && 'doInitByOpen' in canvas._chatcontent) {
canvas._chatcontent.doInitByOpen();
}
- if (canvas.currentRoomObject != null) {
+ if (canvas.currentRoomObj != null) {
content._content1._chattabbottom.updatefontbuttonvisible();
}
this.doBlink = false;
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTab.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTab.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTab.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTab.lzx Thu Nov 19 18:31:47 2015
@@ -63,7 +63,7 @@ This is used in the conference.
this.sendMessageWithClientByPublicSID.doCall();
- if (canvas.currentRoomObject != null) {
+ if (canvas.currentRoomObj != null) {
_chattabbottom.updatefontbuttonvisible();
}
]]>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx Thu Nov 19 18:31:47 2015
@@ -69,7 +69,7 @@
om[6] = parent.parent.isPrivate ? parent.parent.parent.refObj.publicSID : canvas.publicSID;
om[7] = canvas.isrtl;
om[8] = hib.userobject.userId;
- om[9] = canvas.currentRoomObject.chatModerated && !canvas.ismoderator;
+ om[9] = canvas.currentRoomObj.chatModerated && !canvas.ismoderator;
if ($debug) Debug.write("send: ", parent.parent.parent);
if (parent.parent.isPrivate) {
parent.sendMessageWithClientByPublicSID.doCall();
@@ -119,8 +119,8 @@
</labelCheckbox>
<method name="updatefontbuttonvisible">
- if ($debug) Debug.write("chatTabBottom updatefontbuttonvisible allowFontStyles", canvas.currentRoomObject.allowFontStyles);
- _button.fontbutton.setAttribute('visible', canvas.currentRoomObject.allowFontStyles);
+ if ($debug) Debug.write("chatTabBottom updatefontbuttonvisible allowFontStyles", canvas.currentRoomObj.allowFontStyles);
+ _button.fontbutton.setAttribute('visible', canvas.currentRoomObj.allowFontStyles);
</method>
<view name="_button" width="140" y="22" align="right">
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItem.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItem.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItem.lzx Thu Nov 19 18:31:47 2015
@@ -24,7 +24,7 @@
<class name="chatTabItem" extends="view"
width="240" >
- <attribute name="user_id" value="0" type="number" />
+ <attribute name="userId" value="0" type="number" />
<attribute name="username" value="" type="string" />
<attribute name="usertime" value="" type="string" />
<attribute name="usercolor" value="0" type="string" />
@@ -36,7 +36,7 @@
if($debug) Debug.write("chatTab Item on init");
var downloadurl = canvas.getUrl() + 'DownloadHandler?fileName=CHAT'
+'&moduleName=chat&parentPath=&room_id='
- +'&remoteUserid='+this.user_id
+ +'&remoteUserid='+this.userId
+'&sid='+canvas.sessionId;
//Debug.write("downloadurl "+downloadurl);
this._userpic.setAttribute('src',downloadurl);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx Thu Nov 19 18:31:47 2015
@@ -23,7 +23,7 @@
<class name="chatTabItemEmoticons" extends="view" width="$once{ parent.width }" bgcolor="$once{ this.usercolor }">
- <attribute name="user_id" value="0" type="number" />
+ <attribute name="userId" value="0" type="number" />
<attribute name="username" value="" type="string" />
<attribute name="usertime" value="" type="string" />
<attribute name="usercolor" value="0" type="string" />
@@ -37,7 +37,7 @@
<handler name="oninit">
<![CDATA[
if ($debug) Debug.write("this.picture_uri :: ",this.picture_uri);
- this._userpic.setAttribute('src', canvas.getPictureUrl(this.picture_uri, '&moduleName=chat&remoteUserid='+this.user_id));
+ this._userpic.setAttribute('src', canvas.getPictureUrl(this.picture_uri, '&moduleName=chat&remoteUserid='+this.userId));
if(canvas.isrtl == 'true'){
if($debug) Debug.write("chatTabItemEmoticons RTL is set");
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx Thu Nov 19 18:31:47 2015
@@ -74,7 +74,7 @@
<netRemoteCallHib name="setUsernameAndSession" funcname="setUsernameAndSession" remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return canvas.user_id;</method></netparam>
+ <netparam><method name="getValue">return canvas.userId;</method></netparam>
<netparam><method name="getValue">return canvas.currentuser;</method></netparam>
<netparam><method name="getValue">return canvas.firstName;</method></netparam>
<netparam><method name="getValue">return canvas.lastName;</method></netparam>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx Thu Nov 19 18:31:47 2015
@@ -123,7 +123,7 @@
//if ($debug) Debug.write("!!!!!!!!!!! invitee :: ", invitee);
canvas.setAttribute('currentuser', email);
- canvas.setAttribute('user_id', -invitee.user_id);
+ canvas.setAttribute('userId', -invitee.id);
canvas.setAttribute('mail', email);
if (!invitee.firstname && !invitee.lastname) {
if ($debug) Debug.write("!!!!!!!!!!! Nickname invitation ", email);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx Thu Nov 19 18:31:47 2015
@@ -104,7 +104,7 @@
}
this._giveExclusiveAudioView.bringToFront();
- this.isMicrophonesRoom = canvas.currentRoomObject.showMicrophoneStatus;
+ this.isMicrophonesRoom = canvas.currentRoomObj.showMicrophoneStatus;
if (isMicrophonesRoom) {
this._innertop.setAttribute("bgcolor", "0xFF6600");
this._innerbottom.setAttribute("bgcolor", "0xFF6600");
@@ -116,7 +116,7 @@
<handler name="ony">
<![CDATA[
- if (this.isInterview || this.custom || canvas.currentRoomObject.hideWhiteboard) {
+ if (this.isInterview || this.custom || canvas.currentRoomObj.hideWhiteboard) {
return;
}
var bounds = this.getBounds();
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Thu Nov 19 18:31:47 2015
@@ -156,7 +156,7 @@
var save = g["savecamdata"];
if ($debug) Debug.write("save: ",save,g["cam"],g["mic"],this.isSyncUpdate);
//In case its an Audio-Only Room this box should not close automatically
- if ($debug) Debug.write("canvas.currentRoomObject: ", canvas.currentRoomObject);
+ if ($debug) Debug.write("canvas.currentRoomObj: ", canvas.currentRoomObj);
//In case the user presses the Sync Button this box should
//not close automatically and do the user-prefered values
@@ -192,7 +192,7 @@
if ($debug) Debug.write("parent.setUserAVSettings -2- ",parent.remoteMessage);
if ($debug) Debug.write("parent.setUserAVSettings -3- ",parent.cam_default_width);
if ($debug) Debug.write("parent.setUserAVSettings -4- ",parent.cam_default_height);
- if ($debug) Debug.write("parent.setUserAVSettings -5a- ",canvas.currentRoomObject.rooms_id);
+ if ($debug) Debug.write("parent.setUserAVSettings -5a- ",canvas.currentRoomObj.id);
if ($debug) Debug.write("parent.setUserAVSettings -6- ",canvas.publicSID);
parent.setUserAVSettings.doCall();
@@ -205,7 +205,7 @@
<netparam><method name="getValue">return parent.parent.remoteMessage;</method></netparam>
<netparam><method name="getValue">return parent.parent.cam_default_width;</method></netparam>
<netparam><method name="getValue">return parent.parent.cam_default_height;</method></netparam>
- <netparam><method name="getValue">return canvas.currentRoomObject.rooms_id;</method></netparam>
+ <netparam><method name="getValue">return canvas.currentRoomObj.id;</method></netparam>
<netparam><method name="getValue">return canvas.publicSID;</method></netparam>
<netparam><method name="getValue">return parent.parent.interviewPodId;</method></netparam>
<handler name="ondata" args="value">
@@ -522,7 +522,7 @@
selectListItem(availableMics, foundStoredMic, mics.length > 0);
// settings
- var addCams = canvas.userobject.canVideo && !canvas.currentRoomObject.isAudioOnly && cameras.length > 0;
+ var addCams = canvas.userobject.canVideo && !canvas.currentRoomObj.audioOnly && cameras.length > 0;
var addMics = mics.length > 0;
if (addCams && addMics) {
availableSettings.addItem(canvas.getLabelName(448), "av");
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx Thu Nov 19 18:31:47 2015
@@ -37,7 +37,7 @@
this.initRatio = w / h;
this.setAttribute("width",w+this.videoInsetX);
- if (canvas.currentRoomObject.showMicrophoneStatus) {
+ if (canvas.currentRoomObj.showMicrophoneStatus) {
this.setAttribute("bottomBarHeight",this._innertop.height + 1);
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx?rev=1715233&r1=1715232&r2=1715233&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/videoUserProfilePicSWF10.lzx Thu Nov 19 18:31:47 2015
@@ -27,7 +27,7 @@
<handler name="oninit">
<![CDATA[
var extra = value.sipTransport ? "&parentPath=../default&moduleName=videoconf1"
- : '&parentPath=&moduleName=remoteuserprofile&remoteUserid='+this.value.user_id;
+ : '&parentPath=&moduleName=remoteuserprofile&remoteUserid='+this.value.userId;
this._userpic.setAttribute('src', canvas.getPictureUrl(value.picture_uri, extra));
]]>