Author: solomax Date: Thu Nov 19 17:58:17 2015 New Revision: 1715226 URL: http://svn.apache.org/viewvc?rev=1715226&view=rev Log: [OPENMEETINGS-1279] room looks better (still unusable)
Removed: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/moduleConfiguration.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListDetails.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/testsetup/ Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.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/mainAttributes.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/library.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/library.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/restrictedConferenceRoom.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/errorPopup.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/chatTabItemEmoticons.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx?rev=1715226&r1=1715225&r2=1715226&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx Thu Nov 19 17:58:17 2015 @@ -55,14 +55,6 @@ } </method> - <method name="construct" args="p,args"><![CDATA[ - super.construct(p, args); - if ($debug) Debug.write("basePropertyPanel:: construct"); - ]]></method> - <method name="init"><![CDATA[ - super.init(); - if ($debug) Debug.write("basePropertyPanel:: init"); - ]]></method> <handler name="oninit"> if ($debug) Debug.write("basePropertyPanel:: oninit"); this.initheight=this.height; Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx?rev=1715226&r1=1715225&r2=1715226&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx Thu Nov 19 17:58:17 2015 @@ -31,11 +31,6 @@ <event name="ontabcontentleave" /> - <method name="construct" args="p,args"><![CDATA[ - super.construct(p, args); - if ($debug) Debug.write("baseContentView:: construct"); - ]]></method> - <handler name="oninit"><![CDATA[ if ($debug) Debug.write("baseContentView:: oninit"); canvas.currentContentView = this; 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=1715226&r1=1715225&r2=1715226&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 17:58:17 2015 @@ -581,9 +581,7 @@ canvas.directRoomObj = value; canvas.thishib.loaderVar.close(); } else { - canvas.setRoomValues(value.type,value.id,value); - var r = value; - r.currentusers = ''; //this might be huge list + canvas.setRoomValues(value); } } else { new lz.labelerrorPopup(canvas,{errorlabelid:1286}); @@ -853,17 +851,17 @@ if (this.parent.modus == "conference") { if ($debug) Debug.write("############## start broadcasting "); parent.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID; - parent.setBroadCastingFlag.canVideo = !canvas.currentRoomObj.isAudioOnly; + parent.setBroadCastingFlag.canVideo = !canvas.currentRoomObj.audioOnly; parent.setBroadCastingFlag.isAllowedToBroadCastAV = true; parent.setBroadCastingFlag.doCall(); } canvas._drawarea.onopenWhiteBoard.sendEvent(); - if ($debug) Debug.write("room ",canvas.currentRoomObject); - if ($debug) Debug.write("roomType_id ",canvas.currentRoomObject.type); + if ($debug) Debug.write("room ",canvas.currentRoomObj); + if ($debug) Debug.write("roomType_id ",canvas.currentRoomObj.type); - if (canvas.currentRoomObject.type != 'restricted') { - if (canvas.currentRoomObj.isModeratedRoom) { + if (canvas.currentRoomObj.type != 'restricted') { + if (canvas.currentRoomObj.moderated) { if (value.length == 0 && !messageAlreadyThrown){ new lz.labelerrorPopup(canvas,{errorlabelid:641}); } @@ -1597,11 +1595,6 @@ canvas.roomClosed(); } else if (value.message=='inviteToRoom'){ if ($debug) Debug.write("Incoming Room Invitation ",value); - new lz.chatParticipantsInviteNotification(canvas,{ - publicSID:value.publicSID, - usermessage:value.usermessage, - roomId:value.roomId - }); } else if (value.message=='inviteToRoomAnswer'){ if ($debug) Debug.write("Incoming Room inviteToRoomAnswer ",value); new lz.errorPopup(canvas,{ 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=1715226&r1=1715225&r2=1715226&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 17:58:17 2015 @@ -19,7 +19,6 @@ --> <library> - <include href="remote/" /> <include href="components/" /> <include href="hibernate/" /> @@ -33,11 +32,4 @@ <include href="mainDatasets.lzx" /> <include href="mainMethods.lzx" /> <include href="logoutConfirm.lzx" /> - - <!-- - Defines the Core Classes that gets loaded in the Main Navigation - --> - <include href="moduleConfiguration.lzx" /> - - </library> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1715226&r1=1715225&r2=1715226&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx Thu Nov 19 17:58:17 2015 @@ -366,8 +366,6 @@ and some more references to temp-objects <!-- item to focus on after rpcErrorDialog has been shown--> <attribute name="focusOnItem" value="null"/> -<attribute name="currentRoomObject" value="null"/> - <attribute name="appointmentNotificationPopUp" value="null"/> <attribute name="conferenceBrowserIsinited" value="false" type="boolean" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1715226&r1=1715225&r2=1715226&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Thu Nov 19 17:58:17 2015 @@ -251,16 +251,6 @@ this.setAttribute('defaultWhiteboardHeight',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardHeight/text()'))); - this.setAttribute('moderatorModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleUser/text()')); - this.setAttribute('moderatorModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleRoom/text()')); - - this.setAttribute('dashboardModuleStartScreen',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleStartScreen/text()')); - this.setAttribute('dashboardModuleCalendar',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleCalendar/text()')); - this.setAttribute('conferenceRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceRoomModule/text()')); - this.setAttribute('restrictedRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/restrictedRoomModule/text()')); - this.setAttribute('interviewRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/interviewRoomModule/text()')); - this.setAttribute('recordModule',canvas.myConfigSet.getPointer().xpathQuery('config/recordModule/text()')); - this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()')); this.setAttribute('httphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/httphostlocal/text()')); this.setAttribute('protocol',canvas.myConfigSet.getPointer().xpathQuery('config/protocol/text()')); @@ -500,31 +490,30 @@ ]]> </method> - <method name="setRoomValues" args="roomTypeId,roomId,roomObj"> - if ($debug) Debug.warn("setRoomValues ",roomTypeId,roomId,roomObj); - canvas.isConference = roomTypeId == 'conference'; - + <method name="setRoomValues" args="roomObj"> + if ($debug) Debug.warn("setRoomValues ",roomObj); //this is needed cause in the rpc-method *getCurrentModeratorList* we check if its room.type == 'restricted' //if so we will not show any *There is no Moderator* Warning Dialog - canvas.currentRoomObject = roomObj; + canvas.currentRoomObj = roomObj; - hib.currentroomid = roomId; if (roomObj != null) { - if (roomTypeId == 'conference') { - new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:roomObj}); - } else if (roomTypeId == 'restricted') { + hib.currentroomid = roomObj.id; + canvas.isConference = roomObj.type == 'conference'; + + if (roomObj.type == 'conference') { + new lz.flexibleConferenceRoom(canvas.main_content._content.inner, {roomobj:roomObj}); + } else if (roomObj.type == 'restricted') { new lz.restrictedConferenceRoom(canvas.main_content._content.inner, {roomobj:roomObj}); - //new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj}); - } else if (roomTypeId == 'interview') { - new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:roomObj}); + } else if (roomObj.type == 'interview') { + new lz.interviewConferenceRoom(canvas.main_content._content.inner, {roomobj:roomObj}); } } </method> <method name="roomClosed"> <![CDATA[ - if ($debug) Debug.write("canvas.currentRoomObject ",canvas.currentRoomObject); - new lz.redirectBox(canvas,{redirectURL:canvas.currentRoomObject.redirectURL}); + if ($debug) Debug.write("canvas.currentRoomObj ",canvas.currentRoomObj); + new lz.redirectBox(canvas,{redirectURL:canvas.currentRoomObj.redirectURL}); ]]> </method> 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=1715226&r1=1715225&r2=1715226&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 Thu Nov 19 17:58:17 2015 @@ -138,9 +138,9 @@ </text> <handler name="oninit"> var cmenu = new LzContextMenu(); - if($debug) Debug.write("cmenu: ", cmenu, this); - this.setContextMenu(cmenu); - //cmenu.hideBuiltInItems(); + //if($debug) Debug.write("cmenu: ", cmenu, this); + this.contextmenu = cmenu; + cmenu.hideBuiltInItems(); </handler> </view> 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=1715226&r1=1715225&r2=1715226&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 Thu Nov 19 17:58:17 2015 @@ -38,27 +38,6 @@ ]]> </handler> - <!-- - public Long requestUserToContactList(String SID, Long userToAdd_id, - String domain, String port, String webapp) - --> - <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.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> - <handler name="ondata" args="value"> - <![CDATA[ - if ($debug) Debug.write("requestUserToContactList: ",value); - if (value > 0) { - new lz.labelerrorPopup(canvas,{labelid:1267,errorlabelid:1266}); - } - ]]> - </handler> - </netRemoteCallHib> - <view width="$once{ parent.width }" height="$once{ parent.height-1 }" bgcolor="0xFFFFFF" opacity="0.2" /> @@ -81,12 +60,7 @@ <miniIconsImage name="add" src="$once{ canvas.getThemeImage('edit_add_rsc') }" width="16" height="16" y="20" x="$once{ parent.width - 80 }" showhandcursor="true"> <handler name="onclick"> - if ($debug) Debug.write("Start Conference"); - if (hib.userobject.id == parent.userId) { - new lz.labelerrorPopup(canvas,{errorlabelid:1225}); - return; - } - parent.requestUserToContactList.doCall(); + if ($debug) Debug.write("Add to contacts"); </handler> <labelTooltip labelid="1186" /> </miniIconsImage> @@ -94,18 +68,7 @@ <miniIcons name="private_message_add" resource="private_message_add_rsc" width="16" height="16" y="20" x="$once{ parent.width - 60 }" showhandcursor="true"> <handler name="onclick"> - if ($debug) Debug.write("Start Conference"); - new lz.newPrivateMessage(canvas,{ - x:200,y:120, - refObj:null, - minimizable:true, - maximizable:true, - userObject:null, - isdragable:true, - userId:parent.userId, - width:canvas.width-300, - height:canvas.height-130 - }); + if ($debug) Debug.write("Private message"); </handler> <labelTooltip labelid="1253" /> </miniIcons> @@ -113,10 +76,7 @@ <miniIcons resource="user_profile_rsc" width="16" height="16" y="20" x="$once{ parent.width - 40 }" showhandcursor="true"> <handler name="onclick"> - if ($debug) Debug.write("Start Conference"); - new lz.viewUserProfileWindow(canvas,{ - userId:parent.userId - }); + if ($debug) Debug.write("User Profile"); </handler> <labelTooltip labelid="1236" /> </miniIcons> @@ -125,9 +85,6 @@ y="20" x="$once{ parent.width - 20 }" showhandcursor="true"> <handler name="onclick"> if ($debug) Debug.write("Start Conference"); - new lz.chatParticipantsInviteConference(canvas,{ - publicSID:parent.publicSID - }); </handler> <labelTooltip labelid="1131" /> </miniIcons> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/library.lzx?rev=1715226&r1=1715225&r2=1715226&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/library.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/library.lzx Thu Nov 19 17:58:17 2015 @@ -26,7 +26,6 @@ <include href="chatMiniButton.lzx" /> <include href="chatBarMenu.lzx" /> - <include href="inviteuser/" /> <include href="chatParticipants.lzx" /> <include href="fontOptions.lzx" /> 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=1715226&r1=1715225&r2=1715226&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 Thu Nov 19 17:58:17 2015 @@ -236,10 +236,10 @@ <horizontalDropDownSpacer /> <conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" enabled="${ canvas.userId != -1 }" /> <horizontalDropDownSpacer - visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObject.sipEnabled }" /> + visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }" /> <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer" - visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObject.sipEnabled }" - enabled="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObject.sipEnabled }"/> + visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }" + enabled="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }"/> <horizontalDropDownSpacer /> <conferencDropDownMenuItem labelid="1126" command="cmd_editWhiteboardDefault" enabled="true"/> <!-- Save Whiteboard as Image menues are commented for now Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/library.lzx?rev=1715226&r1=1715225&r2=1715226&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/library.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/library.lzx Thu Nov 19 17:58:17 2015 @@ -20,8 +20,6 @@ --> <library> - <include href="roomListItem.lzx" /> - <include href="roomListDetails.lzx" /> <include href="conferenceMenubar.lzx" /> </library> 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=1715226&r1=1715225&r2=1715226&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 17:58:17 2015 @@ -61,11 +61,6 @@ <attribute name="meetingTimer" value="null" /> - <method name="construct" args="p,args"><![CDATA[ - super.construct(p, args); - if ($debug) Debug.write("baseConferenceRoom:: construct", p, args); - ]]></method> - <handler name="oninit"> <![CDATA[ if ($debug) Debug.write("baseConferenceRoom:: oninit"); @@ -73,7 +68,6 @@ if ($debug) Debug.write("roomobj: ",this.roomobj); - canvas.currentRoomObject = this.roomobj; var r = this.roomobj; r.currentusers = ''; //this might be huge list 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=1715226&r1=1715225&r2=1715226&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 Thu Nov 19 17:58:17 2015 @@ -21,11 +21,6 @@ <library> <class name="restrictedConferenceRoom" extends="baseConferenceRoom"> - <method name="construct" args="p,args"><![CDATA[ - super.construct(p, args); - if ($debug) Debug.write("restrictedConferenceRoom:: construct", p, args); - ]]></method> - <handler name="oninit"> if ($debug) Debug.write("restrictedConferenceRoom::oninit "); </handler> 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=1715226&r1=1715225&r2=1715226&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 Thu Nov 19 17:58:17 2015 @@ -51,7 +51,6 @@ <include href="interviewuserlist/" /> <include href="restricted/" /> - <include href="testsetup/" /> <include href="sip/" /> <include href="flexibleConferenceRoom/" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/errorPopup.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/errorPopup.lzx?rev=1715226&r1=1715225&r2=1715226&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/errorPopup.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/errorPopup.lzx Thu Nov 19 17:58:17 2015 @@ -29,6 +29,7 @@ <attribute name="onCloseFunc" type="object" value="null"/> <handler name="oninit"> + if ($debug) Debug.write("errorPopup::oninit "); if (this.makeModal) { lz.ModeManager.makeModal(this); } 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=1715226&r1=1715225&r2=1715226&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 17:58:17 2015 @@ -33,6 +33,7 @@ <attribute name="doBlink" value="false" type="boolean" /> <handler name="oninit"> + if ($debug) Debug.write("baseTabChatPanel:: oninit"); canvas._currentChatPanel = this; this.fadeDelegate = new LzDelegate( this, "showText" ); </handler> @@ -174,7 +175,7 @@ <view name="content" visibility="hidden" y="22" height="${ parent.height-22 }" width="${ parent.width }"> - <chatBarMenu name="chatbar"> + <!-- chatBarMenu name="chatbar"> <attribute name="refObj" value="null" /> <attribute name="objMessage" value="null" /> <attribute name="publicSID" value="" type="string" /> @@ -220,7 +221,7 @@ </chatBarMenu> - <chatTab name="_content1" /> + <chatTab name="_content1" /--> </view> 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=1715226&r1=1715225&r2=1715226&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 17:58:17 2015 @@ -100,40 +100,13 @@ <miniIconsImage name="add" src="$once{ canvas.getThemeImage('edit_add_rsc') }" width="16" height="16" y="2" x="$once{ parent.width - 122 }" showhandcursor="true"> <handler name="onclick"> - if ($debug) Debug.write("Start Conference"); - if (hib.userobject.user_id == parent.user_id) { - new lz.labelerrorPopup(canvas,{errorlabelid:1225}); - return; - } - parent.requestUserToContactList.doCall(); + if ($debug) Debug.write("Add tpo contacts"); </handler> <labelTooltip labelid="1186" /> </miniIconsImage> </state> - <!-- - public Long requestUserToContactList(String SID, Long userToAdd_id, - String domain, String port, String webapp) - --> - <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 canvas.getHttpHost(); </method></netparam> - <netparam><method name="getValue"> return canvas.red5httpport; </method></netparam> - <netparam><method name="getValue"> return canvas.httpRootKey; </method></netparam> - <handler name="ondata" args="value"> - <![CDATA[ - if ($debug) Debug.write("requestUserToContactList: ",value); - if (value > 0) { - new lz.labelerrorPopup(canvas,{labelid:1267,errorlabelid:1266}); - } - ]]> - </handler> - </netRemoteCallHib> - - <!-- space between each line of text --> <attribute name="leading" value="5" type="number" /> @@ -229,18 +202,7 @@ <miniIcons name="private_message_add" resource="private_message_add_rsc" width="16" height="16" y="0" x="$once{ parent.width - 104 }" showhandcursor="true"> <handler name="onclick"> - if ($debug) Debug.write("Start Conference"); - new lz.newPrivateMessage(canvas,{ - x:200,y:120, - refObj:null, - minimizable:true, - maximizable:true, - userObject:null, - isdragable:true, - user_id:parent.user_id, - width:canvas.width-300, - height:canvas.height-130 - }); + if ($debug) Debug.write("New Private message"); </handler> <labelTooltip labelid="1253" /> </miniIcons> @@ -249,9 +211,6 @@ y="0" x="$once{ parent.width - 84 }" showhandcursor="true"> <handler name="onclick"> if ($debug) Debug.write("Start Conference"); - new lz.viewUserProfileWindow(canvas,{ - userId:parent.user_id - }); </handler> <labelTooltip labelid="1236" /> </miniIcons> @@ -261,10 +220,6 @@ showhandcursor="true"> <handler name="onclick"> if ($debug) Debug.write("Start Conference"); - new lz.chatParticipantsInviteConference(canvas,{ - publicSID:parent.publicSID, - user_id:parent.user_id - }); </handler> <labelTooltip labelid="1131" /> </miniIcons> 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=1715226&r1=1715225&r2=1715226&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 17:58:17 2015 @@ -85,11 +85,11 @@ parent.close(); if (canvas.thishib.currentInvitation.room.type == 'conference'){ - new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:canvas.thishib.currentInvitation.room}); + new lz.flexibleConferenceRoom(canvas.main_content._content.inner, {roomobj: canvas.thishib.currentInvitation.room}); } else if (canvas.thishib.currentInvitation.room.type == 'restricted'){ - new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:canvas.thishib.currentInvitation.room}); + new lz.restrictedConferenceRoom(canvas.main_content._content.inner, {roomobj: canvas.thishib.currentInvitation.room}); } else if (canvas.thishib.currentInvitation.room.type == 'interview'){ - new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:canvas.thishib.currentInvitation.room}); + new lz.interviewConferenceRoom(canvas.main_content._content.inner, {roomobj: canvas.thishib.currentInvitation.room}); } </handler> </netRemoteCallHib>