Author: solomax Date: Tue Nov 29 15:49:55 2016 New Revision: 1771919 URL: http://svn.apache.org/viewvc?rev=1771919&view=rev Log: no jira: code clean-up
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx?rev=1771919&r1=1771918&r2=1771919&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx (original) +++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx Tue Nov 29 15:49:55 2016 @@ -78,6 +78,4 @@ <include href="flexibleConferenceRoom.lzx" /> <include href="restrictedConferenceRoom.lzx" /> <include href="interviewConferenceRoom.lzx" /> - - </library> Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1771919&r1=1771918&r2=1771919&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original) +++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Tue Nov 29 15:49:55 2016 @@ -63,7 +63,7 @@ this.sendMessageToMembers.doCall(); } </method> - + <netRemoteCallHib name="sendMessageToMembers" funcname="sendMessageToMembers" showLoading="false" remotecontext="$once{ canvas.thishib }" > <netparam><method name="getValue">return parent.parent.objMessage;</method></netparam> Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx?rev=1771919&r1=1771918&r2=1771919&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx (original) +++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx Tue Nov 29 15:49:55 2016 @@ -83,17 +83,17 @@ if ($debug) Debug.write("setUsername: value, ",canvas.thishib.currentInvitation.room.type); clearStageContent(); parent.close(); - - if (canvas.thishib.currentInvitation.room.type == 'conference'){ - new lz.flexibleConferenceRoom(canvas.main_content._content.inner, {roomobj: canvas.thishib.currentInvitation.room}); - } else if (canvas.thishib.currentInvitation.room.type == 'restricted'){ - new lz.restrictedConferenceRoom(canvas.main_content._content.inner, {roomobj: canvas.thishib.currentInvitation.room}); - } else if (canvas.thishib.currentInvitation.room.type == 'interview'){ - new lz.interviewConferenceRoom(canvas.main_content._content.inner, {roomobj: canvas.thishib.currentInvitation.room}); - } - </handler> - </netRemoteCallHib> - + + var r = canvas.thishib.currentInvitation.room; + if (r.type == 'conference'){ + new lz.flexibleConferenceRoom(canvas.main_content._content.inner, {roomobj: r}); + } else if (r.type == 'restricted'){ + new lz.restrictedConferenceRoom(canvas.main_content._content.inner, {roomobj: r}); + } else if (r.type == 'interview'){ + new lz.interviewConferenceRoom(canvas.main_content._content.inner, {roomobj: r}); + } + </handler> + </netRemoteCallHib> </class> </library> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx?rev=1771919&r1=1771918&r2=1771919&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx Tue Nov 29 15:49:55 2016 @@ -19,6 +19,7 @@ --> <library> + <resource name="userstatus_multiframe_rsc"> <frame src="resources/bullet_ball_glass_green.png"/> <!-- user --> <frame src="resources/bullet_ball_glass_yellow.png"/> <!-- mod --> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1771919&r1=1771918&r2=1771919&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Tue Nov 29 15:49:55 2016 @@ -63,7 +63,7 @@ this.sendMessageToMembers.doCall(); } </method> - + <netRemoteCallHib name="sendMessageToMembers" funcname="sendMessageToMembers" showLoading="false" remotecontext="$once{ canvas.thishib }" > <netparam><method name="getValue">return parent.parent.objMessage;</method></netparam>