You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/11/17 03:48:00 UTC
svn commit: r1714719 [3/3] - in
/openmeetings/branches/3.1.x/openmeetings-flash: ./ src/main/swf/
src/main/swf/audioVideoTest/ src/main/swf/base/
src/main/swf/base/components/ src/main/swf/base/components/calendar/
src/main/swf/base/components/panel/ s...
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx Tue Nov 17 02:47:59 2015
@@ -144,7 +144,8 @@
<handler name="onclick">
<![CDATA[
this.setAttribute('frame',2);
- canvas._videocontainer._videoviewcontent.closeWhiteboard();
+ canvas.commonVideoViewContent.closeWhiteboard();
+ /* FIXME TODO
var t = this;
canvas.videoComp_lc.closeWhiteboard = function(confirm) {
if ($debug) Debug.write("confirm closeWhiteboard:", confirm);
@@ -152,6 +153,7 @@
t.parent.parent.removeObject(t.parent);
}
}
+ */
]]>
</handler>
<labelTooltip labelid="1364" />
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=1714719&r1=1714718&r2=1714719&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 Tue Nov 17 02:47:59 2015
@@ -67,24 +67,11 @@
this.doCall();
} else {
parent.setProgress();
- canvas.thishib.getTimeZones.doCall();
}
]]>
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getRoomTypes" funcname="conferenceservice.getRoomTypes"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("getRoomTypes ",value);
- canvas.roomTypesInitValues = value;
- parent.setProgress();
- parent.setUsernameAndSession.doCall();
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="setUsernameAndSession" funcname="setUsernameAndSession" remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return canvas.sessionId;</method></netparam>
<netparam><method name="getValue">return canvas.user_id;</method></netparam>
@@ -93,31 +80,16 @@
<netparam><method name="getValue">return canvas.lastName;</method></netparam>
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setUsername: value, ",canvas.thishib.currentInvitation.room.roomtype.roomtypes_id);
+ if ($debug) Debug.write("setUsername: value, ",canvas.thishib.currentInvitation.room.type);
clearStageContent();
parent.close();
- if (canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==1){
-
+ if (canvas.thishib.currentInvitation.room.type == 'conference'){
new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:canvas.thishib.currentInvitation.room});
-
- } else if (canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==2){
-
- new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:canvas.thishib.currentInvitation.room});
- new lz.labelerrorPopup(canvas,{error:'No RoomType currently available for roomTypeId 2'});
-
- } else if (canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==3){
-
+ } else if (canvas.thishib.currentInvitation.room.type == 'restricted'){
new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:canvas.thishib.currentInvitation.room});
-
- } else if (canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==4){
-
+ } else if (canvas.thishib.currentInvitation.room.type == 'interview'){
new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:canvas.thishib.currentInvitation.room});
-
- } else if (canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==5){
-
- new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.customRoomModule,roomObj:canvas.thishib.currentInvitation.room});
-
}
</handler>
</netRemoteCallHib>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx Tue Nov 17 02:47:59 2015
@@ -61,11 +61,11 @@
<netRemoteCallHib name="isRoomFull" funcname="conferenceservice.isRoomFull"
remotecontext="$once{ canvas.thishib }" activeErrorHandler="true" >
- <netparam name="pass"><method name="getValue">return canvas.thishib.currentInvitation.room.rooms_id;</method></netparam>
+ <netparam name="pass"><method name="getValue">return canvas.thishib.currentInvitation.room.id;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write(canvas.thishib.currentInvitation.room.rooms_id);
+ if ($debug) Debug.write(canvas.thishib.currentInvitation.room.id);
if ($debug) Debug.write("isRoomFull: ",value);
if (value) {
@@ -96,13 +96,13 @@
</netRemoteCallHib>
<method name="setRoomValues">
- if (canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==1){
+ if (canvas.thishib.currentInvitation.room.type == 'conference'){
canvas.isConference = true;
} else {
canvas.isConference = false;
}
var roomObj = canvas.thishib.currentInvitation.room;
- hib.currentroomid = roomObj.rooms_id;
+ hib.currentroomid = roomObj.id;
</method>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/library.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/library.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/library.lzx Tue Nov 17 02:47:59 2015
@@ -22,7 +22,6 @@
<include href="conference/" />
<include href="chat/" />
- <include href="settings/" />
<include href="invitation/" />
<include href="dashboard/" />
<include href="sipintegration/" />