Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx Tue Nov 17 02:47:59 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8" ?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -22,142 +22,60 @@ <switch> <when property="$as3"> <passthrough> + import flash.net.*; import flash.external.ExternalInterface; - import flash.events.StatusEvent; - import flash.net.SharedObject; - import flash.net.LocalConnection; + import flash.events.*; </passthrough> </when> </switch> -<switch> - <when property="$debug"> - <method name="doDebugInit"> - canvas.setAttribute('debug', true); - </method> - <debug fontsize="11" oninit="Debug.showInternalProperties = true" width="40%" y="50%" x="0" height="50%" /> - </when> - <otherwise> - <method name="doDebugInit"> - </method> - </otherwise> -</switch> - -<include href="incubator/lzcombobox.lzx" /> -<include href="incubator/shadowbox.lzx" /> + <switch> + <when property="$debug"> + <method name="doDebugInit"> + canvas.setAttribute('debug', true); + </method> + <debug fontsize="11" oninit="Debug.showInternalProperties = true" width="80%" y="50%" x="0" height="50%" /> + </when> + <otherwise> + <method name="doDebugInit"> + </method> + </otherwise> + </switch> -<include href="resources/" /> -<include href="base/" /><!-- attributes,methods,datasets,are moved into /base --> -<include href="modules/" /> -<include href="plugins/" /> + <include href="base/" /><!-- attributes,methods,datasets,are moved into /base --> + <include href="resources/" /> + <include href="modules/" /> + <include href="plugins/" /> + <include href="testVideoObject.lzx" /> + <include href="video/" /> + <include href="screensharing/" /> + <include href="audioVideoTest/" /> + <include href="lzrecorder/" /> + <include href="commonVideoViewContentSWF10.lzx" /> + <include href="dragHelper.lzx" /> -<silverstyle name="defaultstyle" isdefault="true" canvascolor="white" /> + <silverstyle name="defaultstyle" isdefault="true" canvascolor="white" /> -<silverstyle name="componentStyle" basecolor="0xFFFFFF" textcolor="0x000000" /> + <silverstyle name="componentStyle" basecolor="0xFFFFFF" textcolor="0x000000" /> -<silverstyle name="itemStyle" textcolor="0xFFFFFF" /> + <silverstyle name="itemStyle" textcolor="0xFFFFFF" /> -<whitestyle name="menuStyle" textcolor="0x000000" /> -<attribute name="localConnectionSendQ" type="object" value="null" /> -<attribute name="localConnectionQProcessorDelegate" type="object" value="null"/> + <whitestyle name="menuStyle" textcolor="0x000000" /> <!-- main colors: 264269 --> - <handler name="oninit"> - ExternalInterface.call("loadingComplete"); + <handler name="oninit"><![CDATA[ doDebugInit(); + ExternalInterface.call("loadingComplete"); var cmenu = new LzContextMenu(); canvas.setDefaultContextMenu(cmenu); cmenu.hideBuiltInItems(); if($debug) Debug.write("main.lzx/oninit:",this); - canvas.lc = new LocalConnection(); - localConnectionSendQ = new Array(); - if($debug) Debug.write("canvas.lc: ", canvas.lc); - localConnectionQProcessorDelegate = new LzDelegate(parent, "processLocalQ"); - lz.Timer.addTimer(localConnectionQProcessorDelegate, 0); - canvas.lc.onStatus = function(obj) { - if (obj.level == 'error') { - if($debug) Debug.warn("LocalConnection:: error while sending ", obj); - } else { - var sm = localConnectionSendQ.shift(); - if (sm) { - realSendViaLocalConnection(sm.cName, sm.mName, sm.tArray); - } else { - lz.Timer.resetTimer(localConnectionQProcessorDelegate, 100); - } - } - } + canvas.commonVideoViewContent = new lz.commonVideoViewContentSWF10(this, {name:'_videoComponent'}); + ]]></handler> - getTimeZoneOffset(this); - </handler> - - <method name="processLocalQ" args="none"> - <![CDATA[ - //if ($debug) Debug.info(" ::processLocalQ !!!!! "); - if (localConnectionSendQ.length > 0) { - var sm = localConnectionSendQ.shift(); - realSendViaLocalConnection(sm.cName, sm.mName, sm.tArray); - } else { - lz.Timer.resetTimer(localConnectionQProcessorDelegate, 100); - } - ]]> - </method> - - <method name="realSendViaLocalConnection" args="lc_name,methodName,tArray"> - <![CDATA[ - /* FIXME TODO as2->3 migration - var so = SharedObject.getLocal("__getObjectSizeHelper"); - so.data.o = tArray; - var size:Number = so.getSize(); - so.clear(); - if (size > 10000 && size < 30001) { - if ($debug) Debug.warn("Too big object being sent via localConnection::10K warn ", size); //,tArray - } else if (size > 30000) { - if ($debug) Debug.error("Too big object being sent via localConnection ", size); //,tArray - return; - } - if ($debug) Debug.info("sendViaLocalConnection ", lc_name, methodName, size); //,tArray - */ - try{ - if (tArray == null || tArray.length == 0) { - canvas.lc.send(lc_name,methodName); - } else if (tArray.length == 1) { - canvas.lc.send(lc_name,methodName,tArray[0]); - } else if (tArray.length == 2) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1]); - } else if (tArray.length == 3) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2]); - } else if (tArray.length == 4) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3]); - } else if (tArray.length == 5) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4]); - } else if (tArray.length == 6) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5]); - } else if (tArray.length == 7) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6]); - } else if (tArray.length == 8) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6],tArray[7]); - } else if (tArray.length == 9) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6],tArray[7],tArray[8]); - } else if (tArray.length == 10) { - canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6],tArray[7],tArray[8],tArray[9]); - } else { - if ($debug) Debug.error("tArray in sendViaLocalConnection longer then allowed") - } - } catch(e:Error) { - if ($debug) Debug.error("Error while sending ", e); - } - ]]> - </method> - <handler name="onerror" args="errmsg"> canvas.remoteLogWrite("error " + errmsg); </handler> -<method name="callback" args="returnValue"> - if ($debug) Debug.write("getTimeZoneOffset callback ",returnValue); - - canvas.stdTimeOffset = Number(returnValue); -</method> - <!-- View for Contents. All Windows will be loaded on this view. --> <view name="main_content" y="${ canvas.naviHeightDelta }" width="${canvas.width}" height="${ canvas.height-canvas.naviHeightDelta }" @@ -174,7 +92,7 @@ <view name="inner" /> <method name="clearAll"> <![CDATA[ - canvas.sendViaLocalConnection(canvas.vid_lc_name, "clearAll", null); + canvas.commonVideoViewContent.clearAll(); if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length); if (this.inner.subviews != null) { if (this.inner.subviews[0] != null) { @@ -195,34 +113,35 @@ <!-- View for Navigation-bar and App-name --> <view name="_mainbgcontentNavi" x="0" y="0" clip="true" width="100%" height="${ canvas.naviHeight }" visibility="hidden"> - <image id="mainApplogo" visible="false" /> - <text id="mainBaseText" visible="false" fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold"> - <switch> - <when property="$as3"> - <passthrough> - import flash.filters.DropShadowFilter; - </passthrough> - </when> - </switch> - <method name="setShadow" > - <![CDATA[ - if (this.isinited && false){ - this.normalMC = this.getDisplayObject(); - this.displacementMap = new DropShadowFilter(); - this.normalMC.filters = [this.displacementMap]; - } - ]]> - </method> - <handler name="onclick"> - lz.Browser.loadURL(canvas.currentappnameurl,"_blank"); - </handler> - <labelTooltip id="mainBaseTextLabel" /> - </text> - <handler name="oninit"> - var cmenu = new LzContextMenu(); - this.setContextMenu(cmenu); - cmenu.hideBuiltInItems(); - </handler> + <image id="mainApplogo" visible="false" /> + <text id="mainBaseText" visible="false" fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold"> + <switch> + <when property="$as3"> + <passthrough> + import flash.filters.DropShadowFilter; + </passthrough> + </when> + </switch> + <method name="setShadow" > + <![CDATA[ + if (this.isinited && false){ + this.normalMC = this.getDisplayObject(); + this.displacementMap = new DropShadowFilter(); + this.normalMC.filters = [this.displacementMap]; + } + ]]> + </method> + <handler name="onclick"> + lz.Browser.loadURL(canvas.currentappnameurl,"_blank"); + </handler> + <labelTooltip id="mainBaseTextLabel" /> + </text> + <handler name="oninit"> + var cmenu = new LzContextMenu(); + if($debug) Debug.write("cmenu: ", cmenu, this); + this.setContextMenu(cmenu); + //cmenu.hideBuiltInItems(); + </handler> </view> <!-- View for Conference menu bar at the top side. Visible on conference --> @@ -271,4 +190,4 @@ <text name="_text" align="right" y="56" fontsize="14" fgcolor="red">Loading...</text> </view> -</canvas> \ No newline at end of file +</canvas>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx Tue Nov 17 02:47:59 2015 @@ -24,7 +24,7 @@ <class name="chatParticipants" extends="view" height="40" clickable="true" width="$once{ parent.width }" bgcolor="$once{ canvas.bgColorMenuItems }"> - <attribute name="user_id" value="0" type="number" /> + <attribute name="userId" value="0" type="number" /> <attribute name="username" value="" type="string" /> <attribute name="connectedSince" value="" type="string" /> <attribute name="publicSID" value="" type="string" /> @@ -45,7 +45,7 @@ <netRemoteCallHib name="requestUserToContactList" funcname="userservice.requestUserToContactList" remotecontext="$once{ canvas.thishib }" activeErrorHandler="true" > <netparam><method name="getValue"> return canvas.sessionId; </method></netparam> - <netparam><method name="getValue"> return parent.parent.user_id; </method></netparam> + <netparam><method name="getValue"> return parent.parent.userId; </method></netparam> <netparam><method name="getValue"> return canvas.rtmphostlocal; </method></netparam> <netparam><method name="getValue"> return canvas.red5httpport; </method></netparam> <netparam><method name="getValue"> return canvas.httpRootKey; </method></netparam> @@ -82,7 +82,7 @@ y="20" x="$once{ parent.width - 80 }" showhandcursor="true"> <handler name="onclick"> if ($debug) Debug.write("Start Conference"); - if (hib.userobject.user_id == parent.user_id) { + if (hib.userobject.id == parent.userId) { new lz.labelerrorPopup(canvas,{errorlabelid:1225}); return; } @@ -102,7 +102,7 @@ maximizable:true, userObject:null, isdragable:true, - user_id:parent.user_id, + userId:parent.userId, width:canvas.width-300, height:canvas.height-130 }); @@ -115,7 +115,7 @@ <handler name="onclick"> if ($debug) Debug.write("Start Conference"); new lz.viewUserProfileWindow(canvas,{ - userId:parent.user_id + userId:parent.userId }); </handler> <labelTooltip labelid="1236" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteConference.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteConference.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteConference.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteConference.lzx Tue Nov 17 02:47:59 2015 @@ -24,7 +24,7 @@ width="490" height="430" y="240" x="240" closable="true" labelid="1131" > <attribute name="publicSID" value="" type="string" /> - <attribute name="user_id" value="0" type="number" /> + <attribute name="userId" value="0" type="number" /> <view resource="messagebox_info_rsc" x="10" y="24" /> @@ -55,15 +55,14 @@ new lz.roomListInviteUserItem(parent.inn.inn.inn, { - roomType:value[eg].roomtype.roomtypes_id, currentusers : value[eg].currentusers, obj : value[eg], ispublic : true, - roomid : value[eg].rooms_id, + roomid : value[eg].id, starttime : time, roomname : value[eg].name, publicSID:parent.parent.publicSID, - user_id:parent.parent.user_id + userId:parent.parent.userId }); } } @@ -90,18 +89,17 @@ <netRemoteCallHib name="getRoomsByOrganisationWithoutType" funcname="conferenceservice.getRoomsByOrganisationWithoutType" remotecontext="$once{ canvas.thishib }" > <netparam><method name="getValue">return canvas.sessionId;</method></netparam> - <netparam><method name="getValue">return hib.currentdomainObj.organisation_id;</method></netparam> + <netparam><method name="getValue">return hib.currentdomainObj.id;</method></netparam> <handler name="ondata" args="value"> <![CDATA[ if ($debug) Debug.write("getRoomsByOrganisationWithoutType ",value); if (value != null) { for (var eg = 0; eg < value.length; eg++) { new lz.roomListInviteUserItem(parent.inn.inn.inn,{ - roomType:value[eg].room.roomtype.roomtypes_id, currentusers : value[eg].room.currentusers, obj : value[eg], ispublic : false, - roomid : value[eg].room.rooms_id, + roomid : value[eg].room.id, starttime : parseDateToStringTime(value[eg].room.starttime), roomname : value[eg].room.name, publicSID:parent.parent.publicSID Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteMessage.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteMessage.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteMessage.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteMessage.lzx Tue Nov 17 02:47:59 2015 @@ -27,7 +27,7 @@ <attribute name="refObj" value="null" /> <attribute name="publicSID" value="" type="string" /> - <attribute name="user_id" value="0" type="number" /> + <attribute name="userId" value="0" type="number" /> <attribute name="conferenceRoomName" value="" type="string" /> <attribute name="roomId" value="0" type="number" /> @@ -53,7 +53,7 @@ this.sendMessageWithClientByPublicSIDOrUser.messageObject["publicSID"] = canvas.publicSID; if ($debug) Debug.write("Send to _ ",this.publicSID); - if ($debug) Debug.write("Send to _ ",this.user_id); + if ($debug) Debug.write("Send to _ ",this.userId); this.sendMessageWithClientByPublicSIDOrUser.doCall(); @@ -64,7 +64,7 @@ <attribute name="messageObject" value="null" /> <netparam><method name="getValue">return parent.messageObject;</method></netparam> <netparam><method name="getValue">return parent.parent.publicSID;</method></netparam> - <netparam><method name="getValue">return parent.parent.user_id;</method></netparam> + <netparam><method name="getValue">return parent.parent.userId;</method></netparam> <handler name="ondata" args="value"> <![CDATA[ if ($debug) Debug.write("+sendMessageWithClientByPublicSIDOrUser : ",value); Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx Tue Nov 17 02:47:59 2015 @@ -35,12 +35,10 @@ <attribute name="maxUsers" value="4" type="number" /> - <attribute name="roomType" value="0" type="number" /> - <attribute name="checkForMaxUsers" value="false" type="boolean" /> <attribute name="publicSID" value="" type="string" /> - <attribute name="user_id" value="0" type="number" /> + <attribute name="userId" value="0" type="number" /> <handler name="oninit"> <![CDATA[ @@ -72,11 +70,11 @@ var connectedIsAudience = '_' + 'audi'; if (this.ispublic) { hib.conferencedomain = "public"; - hib.currentroomid = this.obj.rooms_id; + hib.currentroomid = this.obj.id; //Debug.write("ispublic"); } else { - hib.conferencedomain = this.obj.organisation.organisation_id; - hib.currentroomid = this.obj.room.rooms_id; + hib.conferencedomain = this.obj.group.id; + hib.currentroomid = this.obj.room.id; //Debug.write("non ispublic"); } if ($debug) Debug.write("onclick", this); @@ -102,10 +100,10 @@ var roomid = 0; if (this.ispublic) { - roomid = this.obj.rooms_id; + roomid = this.obj.id; //Debug.write("ispublic"); } else { - roomid = this.obj.room.rooms_id; + roomid = this.obj.room.id; //Debug.write("non ispublic"); } @@ -153,7 +151,7 @@ new lz.chatParticipantsInviteMessage(canvas,{ refObj:parent, publicSID:parent.publicSID, - user_id:parent.user_id, + userId:parent.userId, conferenceRoomName:parent.roomname, roomId:parent.roomid }); Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx Tue Nov 17 02:47:59 2015 @@ -104,7 +104,7 @@ ]]> </handler> <handler name="onclick"> - canvas._videocontainer._videoviewcontent.exitRoom(); + canvas.commonVideoViewContent.exitRoom(); </handler> <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1" @@ -234,7 +234,7 @@ <horizontalDropDownSpacer /> <conferencDropDownMenuItem labelid="37" command="cmd_pollResults" enabled="true" /> <horizontalDropDownSpacer /> - <conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" enabled="${ canvas.user_id != -1 }" /> + <conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" enabled="${ canvas.userId != -1 }" /> <horizontalDropDownSpacer visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObject.sipEnabled }" /> <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer" Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListDetails.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListDetails.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListDetails.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListDetails.lzx Tue Nov 17 02:47:59 2015 @@ -23,7 +23,7 @@ <class name="userRoomTabItem" extends="view" width="$once{ parent.width }" > - <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="cbtext" value="" type="string" /> @@ -32,7 +32,7 @@ <![CDATA[ var downloadurl = canvas.getUrl() + 'DownloadHandler?fileName=CHAT' +'&moduleName=chat&parentPath=&room_id=' - +'&remoteUserid='+this.user_id + +'&remoteUserid='+this.userId +'&sid='+canvas.sessionId; if ($debug) Debug.write("downloadurl "+downloadurl); @@ -76,7 +76,7 @@ var username = this.currentusers[i].firstname + " " + this.currentusers[i].lastname + " (" + this.currentusers[i].username + ") "; - new lz.userRoomTabItem(this._users._users._cbtext,{user_id:this.currentusers[i].user_id,username:username,usertime:canvas.getLabelName(408)+parseDateToStringTime(this.currentusers[i].roomEnter)}); + new lz.userRoomTabItem(this._users._users._cbtext,{userId:this.currentusers[i].userId,username:username,usertime:canvas.getLabelName(408)+parseDateToStringTime(this.currentusers[i].roomEnter)}); } } this.bdatum.setAttribute("visibility", "hidden"); Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx Tue Nov 17 02:47:59 2015 @@ -73,10 +73,10 @@ var connectedIsAudience = '_' + 'audi'; if (this.ispublic) { hib.conferencedomain = "public"; - hib.currentroomid = this.obj.rooms_id; + hib.currentroomid = this.obj.id; } else { - hib.conferencedomain = this.obj.organisation.organisation_id; - hib.currentroomid = this.obj.room.rooms_id; + hib.conferencedomain = this.obj.group.id; + hib.currentroomid = this.obj.room.id; } } parent.parent.parent.parent.parent._roomlistdetails.doinit( @@ -129,12 +129,12 @@ if (this.ispublic) { var roomObj = this.obj; hib.conferencedomain = "public"; - hib.currentroomid = this.obj.rooms_id; + hib.currentroomid = this.obj.id; //Debug.write("ispublic"); } else { var roomObj = this.obj.room; - hib.conferencedomain = this.obj.organisation.organisation_id; - hib.currentroomid = this.obj.room.rooms_id; + hib.conferencedomain = this.obj.group.id; + hib.currentroomid = this.obj.room.id; //Debug.write("non ispublic"); } Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx Tue Nov 17 02:47:59 2015 @@ -32,10 +32,10 @@ <!-- Retrieving Appointmentdata for Meeting --> <netRemoteCallHib name="getAppointMentAndTimeZones" remotecontext="$once{ canvas.thishib }" funcname="conferenceservice.getAppointMentDataForRoom" > - <netparam><method name="getValue">return parent.parent.roomobj.rooms_id;</method></netparam> + <netparam><method name="getValue">return parent.parent.roomobj.id;</method></netparam> <handler name="ondata" args="value"> <![CDATA[ - if ($debug) Debug.write("getAppointMentAndTimeZones 1: ",parent.roomobj.rooms_id); + if ($debug) Debug.write("getAppointMentAndTimeZones 1: ",parent.roomobj.id); if ($debug) Debug.write("getAppointMentAndTimeZones 2: ",value); if (value != null) { 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -61,8 +61,10 @@ <attribute name="meetingTimer" value="null" /> - <handler name="oninit"> - <![CDATA[ + <method name="construct" args="p,args"><![CDATA[ + super.construct(p, args); + this.roomobj = args.roomobj; + if ($debug) Debug.write("baseConferenceRoom:: construct", p, args); _mainScrollBar.setAttribute("visibility","hidden"); if ($debug) Debug.write("roomobj: ",this.roomobj); @@ -70,7 +72,6 @@ canvas.currentRoomObject = this.roomobj; var r = this.roomobj; r.currentusers = ''; //this might be huge list - canvas.sendViaLocalConnection(canvas.rtmp_lc_name,"setRoomValues", [this.roomobj.roomtype.roomtypes_id,this.roomobj.rooms_id,r]); if (this.roomobj.isClosed) { canvas.roomClosed(); @@ -91,8 +92,9 @@ } } + canvas.currentBaseConferenceRoom = this; if (this.roomobj.hideTopBar == null || !this.roomobj.hideTopBar) { - createMenu(); + canvas.currentBaseConferenceRoom.createMenu(); canvas._conferencemenu.setAttribute('visibility','visible'); } else { canvas.setAttribute('naviHeight',0); @@ -118,19 +120,19 @@ this.meetingTimer = new lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj}); } - canvas.currentBaseConferenceRoom = this; canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions); + ]]></method> + <handler name="oninit"> + <![CDATA[ ]]> </handler> - <method name="createMenu"/> - <handler name="onkeydown" reference="lz.Keys" args="keyCode"> <![CDATA[ if ($debug) Debug.write("onkeydown:: keyCode = ", keyCode); // common keys are processed firstly if (canvas.ARRANGE_WINDOWS_KEY == keyCode) { - canvas.sendViaLocalConnection(canvas.vid_lc_name, "arrangeWindows", null); + canvas.commonVideoViewContent.arrangeWindows(); return; } if (canvas.GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) { @@ -142,14 +144,12 @@ return; } if (canvas.MUTE_AUDIO_KEY == keyCode) { - canvas._videocontainer._videoviewcontent.muteSound(canvas.publicSID, !canvas.micMuted); + canvas.commonVideoViewContent.muteSound(canvas.publicSID, !canvas.micMuted); return; } ]]> </handler> - <screenSharingAdapter name="_screenSharingAdapter" /> - <baseTabChatPanel name="_chatPanelStrict" labelid="616" height="200" x="${ parent._sidePanel.width }" y="${ canvas.height - (this.height) - ((canvas.currentRoomObj.hideTopBar) ? 0 : 28) }" @@ -159,7 +159,7 @@ <handler name="ontabcontentleave"> if ($debug) Debug.write("################# ontabcontentleave:",this); - this._screenSharingAdapter.closeAllScreenSharings(); + canvas.commonVideoViewContent.closeAllScreenSharings(); canvas.currentBaseConferenceRoom = null; @@ -172,10 +172,7 @@ //reset rights canvas.isAllowedToGiveExclusiveAudio = false; - if (canvas._videocontainer!=null) { - canvas._videocontainer.resetAllValues(); - canvas._videocontainer = null; - } + canvas.commonVideoViewContent.resetAllValues(); if (canvas._chatcontent!=null) { canvas._chatcontent = null; } Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Tue Nov 17 02:47:59 2015 @@ -43,12 +43,6 @@ height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visible) ? 28 : 6) + ((canvas.currentRoomObj.hideTopBar) ? 28:0)}" /> - <!-- - ############################### - This is the container for all Videos - --> - <commonVideoViewContent name="_videoviewcontent" /> - </class> </library> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx Tue Nov 17 02:47:59 2015 @@ -285,7 +285,7 @@ <miniIconsNew name="_muteDevice" x="120" width="16" height="16" innerResource="mute_btn_rsc" showhandcursor="true"> <handler name="onclick"> - canvas._videocontainer._videoviewcontent.muteSound(canvas.publicSID, true); + canvas.commonVideoViewContent.muteSound(canvas.publicSID, true); </handler> <labelTooltip name="_tip" labelid="1403" /> </miniIconsNew> @@ -293,7 +293,7 @@ <miniIconsNew name="_unMuteDevice" x="120" width="16" height="16" innerResource="unmute_btn_rsc" showhandcursor="true" > <handler name="onclick"> - canvas._videocontainer._videoviewcontent.muteSound(canvas.publicSID, false); + canvas.commonVideoViewContent.muteSound(canvas.publicSID, false); </handler> <labelTooltip name="_tip" labelid="1404" /> </miniIconsNew> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Tue Nov 17 02:47:59 2015 @@ -21,6 +21,9 @@ <library> <class name="restrictedConferenceRoom" extends="baseConferenceRoom"> + <handler name="oninit"> + if ($debug) Debug.write("restrictedConferenceRoom::oninit "); + </handler> <method name="createMenu"> new lz.restrictedConferenceMenubar(canvas._conferencemenu); </method> @@ -42,12 +45,6 @@ y="0" x="${ parent._sidePanel.width }" width="${ canvas.width - parent._sidePanel.width }" height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" /> - - <!-- - ############################### - This is the container for all Videos - --> - <commonVideoViewContent name="_videoviewcontent" /> </class> 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -89,6 +89,7 @@ <handler name="oninit"> <![CDATA[ + if ($debug) Debug.write("restrictedRoomSidebar::_head::oninit "); for (var eg in this.subviews) { this.subviews[eg].deselect(); } Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx Tue Nov 17 02:47:59 2015 @@ -63,7 +63,7 @@ } new lz.interviewUserListItem(list,{ - user_id:object.user_id, + userId:object.userId, firstname: object.firstname, isSuperModerator:object.isSuperModerator, lastname: lastname, 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -53,21 +53,14 @@ canvas.thishib.reconnectObjRef = this; canvas.thishib.disconnect(); } else { - this.reconnectSuccess(); + canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, true, canvas.getHttpHost(), canvas.red5httpport); } } else { //The user is already in the correct Scope - this.reconnectSuccess(); + canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, true, canvas.getHttpHost(), canvas.red5httpport); } </handler> - <method name="reconnectSuccess"> - if ($debug) Debug.warn("User Reloged In ",canvas.becomemoderator); - //Send to SWF10 video-container to connect on the conference room url - //and wait for the as3ConnectionSuccess-Event - this._videoviewcontent.reconnectSuccess(true); - </method> - <!--- We need to wait till the video-container / as3 app has the connection established otherwise it can happen that the video tries to start playing before the rtmp-connection @@ -96,7 +89,7 @@ for (var i=0;i<value.length;i++) { - if (value[i].user.user_id == canvas.user_id) { + if (value[i].user.userId == canvas.userId) { parent.setRoomValues.applyDefaultModeration = true; canvas.becomeSuperModerator = value[i].isSuperModerator; if ($debug) Debug.info("Make this User to an Moderator"); @@ -110,16 +103,16 @@ canvas.currentusercolor = canvas.getColorForUser(); - var organisation_id = 1; + var groupId = 1; if ($debug) Debug.write(hib.userobject); if ($debug) Debug.write(hib.currentdomainObj); if (hib.currentdomainObj != null) { - organisation_id = hib.currentdomainObj.organisation_id + groupId = hib.currentdomainObj.id } - this.parent.setRoomValues.organisation_id = organisation_id; + this.parent.setRoomValues.groupId = groupId; this.parent.setRoomValues.doCall(); ]]> @@ -128,11 +121,11 @@ <netRemoteCallHib name="setRoomValues" funcname="setRoomValues" remotecontext="$once{ canvas.thishib }" > <attribute name="applyDefaultModeration" value="false" type="boolean" /> - <attribute name="organisation_id" value="0" type="number" /> + <attribute name="groupId" value="0" type="number" /> <netparam><method name="getValue">return hib.currentroomid;</method></netparam> <netparam><method name="getValue">return parent.applyDefaultModeration;</method></netparam> <netparam><method name="getValue">return canvas.becomeSuperModerator;</method></netparam> - <netparam><method name="getValue">return parent.organisation_id;</method></netparam> + <netparam><method name="getValue">return parent.groupId;</method></netparam> <netparam><method name="getValue">return canvas.currentusercolor;</method></netparam> <handler name="ondata" args="roomStatus"> <![CDATA[ @@ -176,7 +169,7 @@ <!-- invoked if another client logs into the room after choosing devices --> <method name="setAVSettingsToClient" args="rcl"> - this._videoviewcontent.setAVSettingsToClient(rcl); + canvas.commonVideoViewContent.setAVSettingsToClient(rcl); </method> <method name="addItem" args="connectedSince,isMod,streamid,username,userroom,formatedDate,position,color,object"> @@ -186,7 +179,7 @@ //Do init only in case this stream is NOT the same as we are if (streamid!=canvas.streamid){ //if ($debug) Debug.write("???????? object.isBroadcasting :: ",object.isBroadcasting); - this._videoviewcontent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, object.interviewPodId, object); + canvas.commonVideoViewContent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, object.interviewPodId, object); } //do add self too @@ -199,7 +192,7 @@ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate); if (canvas.publicSID != object.publicSID){ - this._videoviewcontent.createVideoObject(object.publicSID, false, object.interviewPodId, object); + canvas.commonVideoViewContent.createVideoObject(object.publicSID, false, object.interviewPodId, object); } //Do Add it anyway @@ -212,15 +205,15 @@ interviewPodId has only a meaning in the Room Type Interview --> <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight"> - this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight); + canvas.commonVideoViewContent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight); </method> <method name="updateMuteStatusVideoView" args="roomClient"> - this._videoviewcontent.updateMuteStatusVideoView(roomClient); + canvas.commonVideoViewContent.updateMuteStatusVideoView(roomClient); </method> <method name="setSpeakingByPos" args="publicSID,bool"> - this._videoviewcontent.setSpeakingByPos(publicSID, bool); + canvas.commonVideoViewContent.setSpeakingByPos(publicSID, bool); </method> <!--- @@ -228,7 +221,7 @@ @param int broadcastId broadcastId --> <method name="closeStreamClient" args="publicSID"> - this._videoviewcontent.closeStreamClient(publicSID); + canvas.commonVideoViewContent.closeStreamClient(publicSID); </method> <method name="removeVideoByUser" args="userObject"> @@ -237,18 +230,16 @@ </method> <method name="disconnectclient" args="publicSID"> - this._videoviewcontent.disconnectclient(publicSID); + canvas.commonVideoViewContent.disconnectclient(publicSID); this._participants.disconnectclient(publicSID); </method> <method name="resetAllValues"> - this._videoviewcontent.resetAllValues(); + canvas.commonVideoViewContent.resetAllValues(); </method> <interviewListInner name="_participants" /> - <commonVideoComponentAdapter name="_videoviewcontent"/> - </class> </library> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx Tue Nov 17 02:47:59 2015 @@ -31,7 +31,7 @@ <attribute name="formatedDate" value="" type="string" /> <attribute name="firstname" value="" type="string" /> <attribute name="lastname" value="" type="string" /> - <attribute name="user_id" value="0" type="number" /> + <attribute name="userId" value="0" type="number" /> <attribute name="refObj" value="null" /> <attribute name="isSuperModerator" value="false" type="boolean"/> @@ -79,7 +79,7 @@ <method name="fadeText" args="ignore=null"> <![CDATA[ - this._userpic.setAttribute('src', canvas.getPictureUrl(this.refObj.picture_uri, '&moduleName=chat&remoteUserid='+this.user_id)); + this._userpic.setAttribute('src', canvas.getPictureUrl(this.refObj.picture_uri, '&moduleName=chat&remoteUserid='+this.userId)); ]]> </method> 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -71,7 +71,7 @@ if ($debug) Debug.write("startInterView :: "); var tx = this.getAttributeRelative("x",canvas); var ty = this.getAttributeRelative("y",canvas); - canvas._videocontainer._videoviewcontent.showDevicePopUpInterview(false,this.interviewPodId,tx,ty,this.width,this.height); + canvas.commonVideoViewContent.createEditRecordStream(false, true, this.interviewPodId); </method> <method name="sendConfirmation" args="publicSID"> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx Tue Nov 17 02:47:59 2015 @@ -61,7 +61,7 @@ <method name="checkPods" args="ignore=null"> //if ($debug) Debug.write(":: Pods :: check :: "); - canvas.sendViaLocalConnection(canvas.vid_lc_name, "getVideoObjectCount", [null]); + canvas.commonVideoViewContent.getVideoObjectCount(); lz.Timer.resetTimer(checkPodsDelegate, 1000); </method> @@ -88,12 +88,16 @@ <simplelayout axis="y" spacing="2" /> + <!-- TODO add new pods <commonVideoViewContent name="_videoviewcontent" x="40" > + <simplelayout axis="x" spacing="2" /> - + --> <interviewVideoBox name="interviewVideoBox1" interviewPodId="1" /> <interviewVideoBox name="interviewVideoBox2" x="324" interviewPodId="2" /> + <!-- TODO add new pods </commonVideoViewContent> + --> <view name="_interview" align="center" visible="${ canvas.ismoderator }"> <!-- Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx Tue Nov 17 02:47:59 2015 @@ -37,9 +37,6 @@ <!-- APL author sebawagner --> <resource name="lz_recorder_play" src="resources/webstart_play.png" /> - <include href="commonVideoViewContent.lzx"/> - <include href="commonVideoComponentAdapter.lzx"/> - <include href="screenSharingAdapter.lzx" /> <include href="typing.lzx" /> <include href="whiteboard/" /> @@ -50,14 +47,10 @@ <include href="conference/" /> - <!-- throws an Exception - <include href="browser/"/> - --> <include href="participants/" /> <include href="interviewuserlist/" /> <include href="restricted/" /> - <include href="browser/" /> <include href="testsetup/" /> <include href="sip/" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx Tue Nov 17 02:47:59 2015 @@ -83,7 +83,7 @@ } new lz.participantListItem(this._table.innerList,{ - user_id:object.user_id, + userId:object.userId, isSuperModerator:object.isSuperModerator, firstname:object.firstname, lastname:lastname, 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -34,7 +34,7 @@ <attribute name="formatedDate" value="" type="string" /> <attribute name="firstname" value="" type="string" /> <attribute name="lastname" value="" type="string" /> - <attribute name="user_id" value="0" type="number" /> + <attribute name="userId" value="0" type="number" /> <attribute name="isSuperModerator" value="false" type="boolean"/> <attribute name="refObj" value="null" /> @@ -63,7 +63,7 @@ <![CDATA[ if ($debug) Debug.write("fadeText :1: ",this.refObj); if ($debug) Debug.write("fadeText :2: ",this.refObj.picture_uri); - this._userpic.setAttribute('src', canvas.getPictureUrl(this.refObj.picture_uri, '&moduleName=chat&remoteUserid='+this.user_id)); + this._userpic.setAttribute('src', canvas.getPictureUrl(this.refObj.picture_uri, '&moduleName=chat&remoteUserid='+this.userId)); ]]> </method> @@ -401,7 +401,7 @@ <miniIcons name="_mute" x="82" width="16" height="16" resource="mute_micro_btn_rsc" showhandcursor="true" > <handler name="onclick"> <![CDATA[ - canvas._videocontainer._videoviewcontent.muteSound(parent.parent.refObj.publicSID, !parent.parent.refObj.micMuted); + canvas.commonVideoViewContent.muteSound(parent.parent.refObj.publicSID, !parent.parent.refObj.micMuted); ]]> </handler> <labelTooltip name="_text" text="" labelid="1407" /> @@ -607,7 +607,7 @@ <handler name="onclick"> //TODO: local connection call if ($debug) Debug.write("parent.parent.refObj.publicSID: ",parent.parent.refObj.publicSID); - canvas._videocontainer._videoviewcontent.showDevicePopUp(true); + canvas.commonVideoViewContent.createEditRecordStream(true, false, -1); </handler> <labelTooltip labelid="610" /> </miniIcons> 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -49,11 +49,11 @@ canvas.thishib.reconnectObjRef = this; canvas.thishib.disconnect(); } else { - this.reconnectSuccess(); + canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport); } } else { //The user is already in the correct Scope - this.reconnectSuccess(); + canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport); } </handler> @@ -61,15 +61,6 @@ // </method> - <commonVideoComponentAdapter name="_videoviewcontent" /> - - <method name="reconnectSuccess"> - if ($debug) Debug.write("User Reloged In"); - //Send to SWF10 video-container to connect on the conference room url - //and wait for the as3ConnectionSuccess-Event - this._videoviewcontent.reconnectSuccess(false); - </method> - <!--- We need to wait till the video-container / as3 app has the connection established otherwise it can happen that the video tries to start playing before the rtmp-connection @@ -106,7 +97,7 @@ if (!canvas.becomeSuperModerator) { for (var i=0;i<value.length;i++) { - if (value[i].user.user_id == canvas.user_id) { + if (value[i].user.userId == canvas.userId) { parent.setRoomValues.applyDefaultModeration = true; canvas.becomeSuperModerator = value[i].isSuperModerator; if ($debug) Debug.info("Make this User to an Moderator"); @@ -121,16 +112,16 @@ canvas.currentusercolor = canvas.getColorForUser(); - var organisation_id = 1; + var groupId = 1; if ($debug) Debug.write(hib.userobject); if ($debug) Debug.write(hib.currentdomainObj); if (hib.currentdomainObj != null) { - organisation_id = hib.currentdomainObj.organisation_id + groupId = hib.currentdomainObj.id } - this.parent.setRoomValues.organisation_id = organisation_id; + this.parent.setRoomValues.groupId = groupId; if ($debug) Debug.write("setRoomValues CALL: "); this.parent.setRoomValues.doCall(); @@ -144,11 +135,11 @@ --> <netRemoteCallHib name="setRoomValues" funcname="setRoomValues" remotecontext="$once{ canvas.thishib }" > <attribute name="applyDefaultModeration" value="false" type="boolean" /> - <attribute name="organisation_id" value="0" type="number" /> + <attribute name="groupId" value="0" type="number" /> <netparam><method name="getValue">return hib.currentroomid;</method></netparam> <netparam><method name="getValue">return parent.applyDefaultModeration;</method></netparam> <netparam><method name="getValue">return canvas.becomeSuperModerator;</method></netparam> - <netparam><method name="getValue">return parent.organisation_id;</method></netparam> + <netparam><method name="getValue">return parent.groupId;</method></netparam> <netparam><method name="getValue">return canvas.currentusercolor;</method></netparam> <handler name="ondata" args="roomStatus"> <![CDATA[ @@ -195,7 +186,7 @@ after choosing devices --> <method name="setAVSettingsToClient" args="rcl"> - this._videoviewcontent.setAVSettingsToClient(rcl); + canvas.commonVideoViewContent.setAVSettingsToClient(rcl); </method> <method name="receiveExclusiveAudioFlag" args="publicSID"> @@ -221,7 +212,7 @@ //Do init only in case this stream is NOT the same as we are if (streamid!=canvas.streamid){ //if ($debug) Debug.write("???????? object.isBroadcasting :: ",object.isBroadcasting); - this._videoviewcontent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1, object); + canvas.commonVideoViewContent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1, object); } //do add self too @@ -234,24 +225,24 @@ if (tObj != null) { tObj._miniIcons._loudness.loudness.setAttribute('opacity', bool ? 1 : 0.2); } - this._videoviewcontent.setSpeakingByPos(publicSID, bool); + canvas.commonVideoViewContent.setSpeakingByPos(publicSID, bool); </method> <method name="closeStreamClient" args="publicSID"> - this._videoviewcontent.closeStreamClient(publicSID); + canvas.commonVideoViewContent.closeStreamClient(publicSID); </method> <method name="updateMuteStatusVideoView" args="roomClient"> - this._videoviewcontent.updateMuteStatusVideoView(roomClient); + canvas.commonVideoViewContent.updateMuteStatusVideoView(roomClient); </method> <method name="disconnectclient" args="publicSID"> - this._videoviewcontent.disconnectclient(publicSID); + canvas.commonVideoViewContent.disconnectclient(publicSID); this._participants.disconnectclient(publicSID); </method> <method name="resetAllValues"> - this._videoviewcontent.resetAllValues(); + canvas.commonVideoViewContent.resetAllValues(); </method> <!-- @@ -259,7 +250,7 @@ interviewPodId has only a meaning in the Room Type Interview --> <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight"> - this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight); + 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"> @@ -268,7 +259,7 @@ if (canvas.publicSID != object.publicSID){ if ($debug) Debug.write("### initializeStreams createVideoObject: ", object); - this._videoviewcontent.createVideoObject(object.publicSID, false, -1, object); + canvas.commonVideoViewContent.createVideoObject(object.publicSID, false, -1, object); } //Do Add it anyway Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx Tue Nov 17 02:47:59 2015 @@ -50,7 +50,7 @@ lz.Timer.addTimer( new LzDelegate( this, "fadeText" ), 1000 ); } else { if ($debug) Debug.write("DEMO IS OVER "); - canvas.sendViaLocalConnection(canvas.vid_lc_name, "immediateExitRoom", [true,null]); + canvas.commonVideoViewContent.immediateExitRoom(true,null); } ]]> </method> 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -324,7 +324,7 @@ opacity="0.5" showhandcursor="true"> <handler name="onclick"> if ($debug) Debug.write("mute: ",parent.parent.parent.refObj.publicSID); - canvas._videocontainer._videoviewcontent.muteSound(parent.parent.parent.refObj.publicSID, true); + canvas.commonVideoViewContent.muteSound(parent.parent.parent.refObj.publicSID, true); </handler> <labelTooltip labelid="1384" /> </miniIcons> @@ -333,7 +333,7 @@ showhandcursor="true" visibility="hidden"> <handler name="onclick"> if ($debug) Debug.write("unmute: ",parent.parent.parent.refObj.publicSID); - canvas._videocontainer._videoviewcontent.muteSound(parent.parent.parent.refObj.publicSID, false); + canvas.commonVideoViewContent.muteSound(parent.parent.parent.refObj.publicSID, false); </handler> <labelTooltip labelid="1385" /> </miniIcons> 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -34,10 +34,6 @@ <attribute name="showsVideoInSeparateComponent" value="true" type="boolean" /> <attribute name="timeout" value="500" type="number"/> - <attribute name="batchSize" value="10" type="number"/> - <attribute name="counter" value="0" type="number"/> - <attribute name="batchCreateVideoDelegate" type="object" value="null"/> - <attribute name="initClients" type="object" /> <handler name="onallowUserQuestions" args="bool"> if (bool != null) { @@ -68,23 +64,14 @@ canvas.thishib.reconnectObjRef = this; canvas.thishib.disconnect(); } else { - this.reconnectSuccess(); + canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport); } } else { //The user is already in the correct Scope - this.reconnectSuccess(); + canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport); } </handler> - <commonVideoComponentAdapter name="_videoviewcontent"/> - - <method name="reconnectSuccess"> - if ($debug) Debug.write("User Reloged In"); - //Send to SWF10 video-container to connect on the conference room url - //and wait for the as3ConnectionSuccess-Event - this._videoviewcontent.reconnectSuccess(false); - </method> - <!--- We need to wait till the video-container / as3 app has the connection established otherwise it can happen that the video tries to start playing before the rtmp-connection @@ -115,7 +102,7 @@ if (!canvas.becomeSuperModerator) { for (var i=0;i<value.length;i++) { - if (value[i].user.user_id == canvas.user_id) { + if (value[i].user.userId == canvas.userId) { parent.setRoomValues.applyDefaultModeration = true; canvas.becomeSuperModerator = value[i].isSuperModerator; if ($debug) Debug.info("Make this User to an Moderator"); @@ -130,16 +117,16 @@ canvas.currentusercolor = canvas.getColorForUser(); - var organisation_id = 1; + var groupId = 1; if ($debug) Debug.write(hib.userobject); if ($debug) Debug.write(hib.currentdomainObj); if (hib.currentdomainObj != null) { - organisation_id = hib.currentdomainObj.organisation_id + groupId = hib.currentdomainObj.id } - this.parent.setRoomValues.organisation_id = organisation_id; + this.parent.setRoomValues.groupId = groupId; this.parent.setRoomValues.doCall(); ]]> @@ -148,11 +135,11 @@ <netRemoteCallHib name="setRoomValues" funcname="setRoomValues" remotecontext="$once{ canvas.thishib }" > <attribute name="applyDefaultModeration" value="false" type="boolean" /> - <attribute name="organisation_id" value="0" type="number" /> + <attribute name="groupId" value="0" type="number" /> <netparam><method name="getValue">return hib.currentroomid;</method></netparam> <netparam><method name="getValue">return parent.applyDefaultModeration;</method></netparam> <netparam><method name="getValue">return canvas.becomeSuperModerator;</method></netparam> - <netparam><method name="getValue">return parent.organisation_id;</method></netparam> + <netparam><method name="getValue">return parent.groupId;</method></netparam> <netparam><method name="getValue">return canvas.currentusercolor;</method></netparam> <handler name="ondata" args="roomStatus"> <![CDATA[ @@ -185,10 +172,7 @@ } parent.addItemInitial(value[i]); } - parent.batchCreateVideoDelegate = new LzDelegate(parent, "batchCreateVideo"); - parent.counter = 0; - parent.initClients = value; - lz.Timer.addTimer(parent.batchCreateVideoDelegate, 0); + parent.batchCreateVideo(value); //Render and Show User-List parent._participants.sortAndRenderList(); @@ -200,39 +184,22 @@ </handler> </netRemoteCallHib> - <method name="batchCreateVideo" args="none"> + <method name="batchCreateVideo" args="clients"> <![CDATA[ - if ($debug) Debug.write("interval 0 :: ", counter, initClients.length); - if (!batchCreateVideoDelegate) { - return; - } - var cl = new Array(); - for (var i = 0; i < batchSize; ++i) { - cl[i] = initClients[counter++]; - if (counter == initClients.length) { - break; - } - } - if ($debug) Debug.write("interval:: ", counter, cl.length); - this._videoviewcontent.batchCreateVideo(canvas.streamid, cl); - if (counter == initClients.length) { - lz.Timer.removeTimer(batchCreateVideoDelegate); - batchCreateVideoDelegate = null; + if ($debug) Debug.write("interval 0 :: ", clients.length); + canvas.commonVideoViewContent.batchCreateVideo(canvas.streamid, clients); - //this content must be inited _after_ setting the default values - canvas.thishib.getCurrentModeratorList.doCall(); - //FIXME Issue-1076 - canvas.thishib.checkLzRecording.doCall(); - } else { - lz.Timer.resetTimer(batchCreateVideoDelegate, timeout); - } + //this content must be inited _after_ setting the default values + canvas.thishib.getCurrentModeratorList.doCall(); + //FIXME Issue-1076 + canvas.thishib.checkLzRecording.doCall(); ]]> </method> <!-- invoked if another client logs into the room after choosing devices --> <method name="setAVSettingsToClient" args="rcl"> - this._videoviewcontent.setAVSettingsToClient(rcl); + canvas.commonVideoViewContent.setAVSettingsToClient(rcl); </method> <method name="addItemInitial" args="object"> @@ -263,7 +230,7 @@ //Do init only in case this stream is NOT the same as we are if (streamid != canvas.streamid) { - this._videoviewcontent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1, object); + canvas.commonVideoViewContent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1, object); } this._participants.addItem(object); ]]> @@ -274,7 +241,7 @@ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate); if (canvas.publicSID != object.publicSID){ - this._videoviewcontent.createVideoObject(object.publicSID, false, -1, object); + canvas.commonVideoViewContent.createVideoObject(object.publicSID, false, -1, object); } //Do Add it anyway @@ -287,23 +254,23 @@ interviewPodId has only a meaning in the Room Type Interview --> <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight"> - this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight); + canvas.commonVideoViewContent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight); </method> <method name="setSpeakingByPos" args="publicSID,bool"> - this._videoviewcontent.setSpeakingByPos(publicSID, bool); + canvas.commonVideoViewContent.setSpeakingByPos(publicSID, bool); </method> <method name="closeStreamClient" args="publicSID"> - this._videoviewcontent.closeStreamClient(publicSID); + canvas.commonVideoViewContent.closeStreamClient(publicSID); </method> <method name="resetAllValues"> - this._videoviewcontent.resetAllValues(); + canvas.commonVideoViewContent.resetAllValues(); </method> <method name="removeVideoByUser" args="userObject"> - this._videoviewcontent.removeVideoByUser(userObject.publicSID); + canvas.commonVideoViewContent.removeVideoByUser(userObject.publicSID); </method> <!--- @@ -311,12 +278,12 @@ @param int broadcastId broadcastId --> <method name="disconnectclient" args="publicSID"> - this._videoviewcontent.disconnectclient(publicSID); + canvas.commonVideoViewContent.disconnectclient(publicSID); this._participants.disconnectclient(publicSID); </method> <method name="updateMuteStatusVideoView" args="roomClient"> - this._videoviewcontent.updateMuteStatusVideoView(roomClient); + canvas.commonVideoViewContent.updateMuteStatusVideoView(roomClient); </method> <restrictedUserListInner name="_participants" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx Tue Nov 17 02:47:59 2015 @@ -290,7 +290,7 @@ list.subviews[i].hideModeratorIcons(); } - list.subviews[i].setAttribute("user_id",records[i].user_id); + list.subviews[i].setAttribute("userId",records[i].userId); list.subviews[i].setAttribute("firstname",records[i].firstname); list.subviews[i].setAttribute("isSuperModerator",records[i].isSuperModerator); list.subviews[i].setAttribute("lastname",records[i].lastname); @@ -317,7 +317,7 @@ list.subviews[i].onmouseout.sendEvent(); list.subviews[i].hideModeratorIcons(); - list.subviews[i].setAttribute("user_id",""); + list.subviews[i].setAttribute("userId",""); list.subviews[i].setAttribute("firstname",""); list.subviews[i].setAttribute("isSuperModerator",""); list.subviews[i].setAttribute("lastname",""); @@ -359,7 +359,7 @@ if ($debug) Debug.write(item.itemId,this.renderList[item.itemId].isMod,this.renderList[item.itemId].publicSID); - item.setAttribute("user_id",this.renderList[item.itemId].user_id); + item.setAttribute("userId",this.renderList[item.itemId].userId); item.setAttribute("firstname",this.renderList[item.itemId].firstname); item.setAttribute("isSuperModerator",this.renderList[item.itemId].isSuperModerator); item.setAttribute("lastname",this.renderList[item.itemId].lastname); @@ -387,7 +387,7 @@ item.refObj = null; - item.setAttribute("user_id",""); + item.setAttribute("userId",""); item.setAttribute("firstname",""); item.setAttribute("isSuperModerator",""); item.setAttribute("lastname",""); Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx Tue Nov 17 02:47:59 2015 @@ -32,7 +32,7 @@ <attribute name="formatedDate" value="" type="string" /> <attribute name="firstname" value="" type="string" /> <attribute name="lastname" value="" type="string" /> - <attribute name="user_id" value="0" type="number" /> + <attribute name="userId" value="0" type="number" /> <attribute name="refObj" value="null" /> <attribute name="isSuperModerator" value="false" type="boolean"/> @@ -130,7 +130,7 @@ visible="${ parent.parent.clickable && parent.parent.selfItem && canvas.isBroadCasting }"> <handler name="onclick"> if ($debug) Debug.write("parent.parent.refObj.publicSID: ",parent.parent.refObj.publicSID); - canvas._videocontainer._videoviewcontent.showDevicePopUp(true); + canvas.commonVideoViewContent.createEditRecordStream(true, false, -1); </handler> <labelTooltip labelid="610" /> </miniIcons> 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -126,12 +126,12 @@ tWhiteboardBtn.onmouseout.sendEvent(null); </method> - <handler name="onisopen" args="o"> - if ($debug) Debug.write("onisopen",o); + <handler name="onisopen" args="o"><![CDATA[ + if ($debug) Debug.write("onisopen", o, canvas._chatcontent); canvas.chatHeight = o ? 200 : 222; - canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "hideChatContent", [!o]); + canvas.commonVideoViewContent.hideChatContent(!o); if (o) { - if ('doInitByOpen' in canvas._chatcontent) { + if (canvas._chatcontent != null && 'doInitByOpen' in canvas._chatcontent) { canvas._chatcontent.doInitByOpen(); } if (canvas.currentRoomObject != null) { @@ -144,7 +144,7 @@ } else { this.content.setAttribute("visibility","hidden"); } - </handler> + ]]></handler> <method name="startBlink"> if ($debug) Debug.write("startBlink",this.opacity); Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx Tue Nov 17 02:47:59 2015 @@ -107,7 +107,7 @@ new lz.chatTabItemEmoticons(this._cbtext,{ rawMessage: value, messageObj:messageObj, - user_id:value[8], + userId:value[8], publicSID:value[6], message:value[4], picture_uri:client.picture_uri, 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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015 @@ -68,7 +68,7 @@ om[5] = canvas.currentusercolor; om[6] = parent.parent.isPrivate ? parent.parent.parent.refObj.publicSID : canvas.publicSID; om[7] = canvas.isrtl; - om[8] = hib.userobject.user_id; + om[8] = hib.userobject.userId; om[9] = canvas.currentRoomObject.chatModerated && !canvas.ismoderator; if ($debug) Debug.write("send: ", parent.parent.parent); if (parent.parent.isPrivate) { @@ -119,10 +119,8 @@ </labelCheckbox> <method name="updatefontbuttonvisible"> - if ($debug) Debug.write("chatTabBottom updatefontbuttonvisible allowFontStyles", - canvas.currentRoomObject.allowFontStyles); - _button.fontbutton.setVisible(canvas.currentRoomObject.allowFontStyles == true || - canvas.currentRoomObject.allowFontStyles == null); + if ($debug) Debug.write("chatTabBottom updatefontbuttonvisible allowFontStyles", canvas.currentRoomObject.allowFontStyles); + _button.fontbutton.setAttribute('visible', canvas.currentRoomObject.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/fileexplorer/fileExplorer.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx Tue Nov 17 02:47:59 2015 @@ -25,6 +25,15 @@ Class fileExplorer --> <class name="fileExplorer" extends="view" > + <dataset name="getFileExplorerByRoomSelf" type="http" > + <handler name="ondata" args="d"> + <![CDATA[ + if ($debug) Debug.write("ondata 1 ",this.src); + if ($debug) Debug.write("ondata 2 ",d); + parent.parseRootItems(parent.parseRootToRoomObject(d)); + ]]> + </handler> + </dataset> <attribute name="parentFolderId" value="-2" type="number" /> @@ -158,30 +167,22 @@ canvas._drawarea.playVideoSynced(itemObj.fileExplorerItemId,itemObj.fileName,itemObj.flvWidth,itemObj.flvHeight); </method> - <method name="loadFiles"> - <![CDATA[ - if (this["getFileExplorerByRoomSelf"]) { - //this.getFileExplorerByRoom.doCall(); - var downloadurl = canvas.getUrl()+'services/FileService/getFileExplorerByRoomSelfInternal?' - +'SID='+canvas.sessionId - +'&roomId='+hib.currentroomid; - - this.getFileExplorerByRoomSelf.setAttribute("src",downloadurl); - if ($debug) Debug.write("getFileExplorerByRoomSelf doRequest 1 ",downloadurl); - this.getFileExplorerByRoomSelf.doRequest(); - } - ]]> - </method> - - <dataset name="getFileExplorerByRoomSelf" type="http" > - <handler name="ondata" args="d"> - <![CDATA[ - if ($debug) Debug.write("ondata 1 ",this.src); - if ($debug) Debug.write("ondata 2 ",d); - parent.parseRootItems(parent.parseRootToRoomObject(d)); - ]]> - </handler> - </dataset> + <method name="loadFiles"> + <![CDATA[ + if ($debug) Debug.write("loadFiles ", this, this.getFileExplorerByRoomSelf); + /* FIXME TODO + //this.getFileExplorerByRoom.doCall(); + var downloadurl = canvas.getUrl()+'services/FileService/getFileExplorerByRoomSelfInternal?' + +'SID='+canvas.sessionId + +'&roomId='+hib.currentroomid; + + if ($debug) Debug.write("getFileExplorerByRoomSelf doRequest 1 ",downloadurl); + this.getFileExplorerByRoomSelf.setAttribute("src",downloadurl); + if ($debug) Debug.write("loadFiles ", this); + this.getFileExplorerByRoomSelf.doRequest(); + */ + ]]> + </method> <method name="parseParentToRoomObject" args="dObj"> <![CDATA[ Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx Tue Nov 17 02:47:59 2015 @@ -161,7 +161,7 @@ var tx = this.getAttributeRelative("x",canvas)+tObjectDimension.x+this._content.x; var ty = this.getAttributeRelative("y",canvas)+tObjectDimension.y+this._content.y; - canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "playbackWhiteboardVideo", [this.name,this.recordingName,0,tx,ty,tObjectDimension.width,tObjectDimension.height]); + canvas.commonVideoViewContent.playbackWhiteboardVideo(this.name,this.recordingName,0,tx,ty,tObjectDimension.width,tObjectDimension.height); } ]]> </method> @@ -246,7 +246,7 @@ this._progress._progressbar._time.setAttribute("text",""); this._progress._progressbar._pointer.setAttribute("x",0); if ($debug) Debug.write("SEND stopWhiteboardVideo ",this.name); - canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "stopWhiteboardVideo",[this.name]); + canvas.commonVideoViewContent.stopWhiteboardVideo(this.name); this.isPaused = true; </method> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx Tue Nov 17 02:47:59 2015 @@ -51,6 +51,6 @@ <include href="fixedFileExplorerWhiteboardPanel.lzx" /> <include href="whiteboardMiniButton.lzx" /> <include href="whiteboardBarMenu.lzx" /> - + <include href="playBackWhiteboardVideo.lzx" /> </library>
