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 2016/01/20 16:22:55 UTC
svn commit: r1725740 - in
/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf:
base/hibernate/hibRtmpConnection.lzx
modules/conference/popups/chooseNickName.lzx
Author: solomax
Date: Wed Jan 20 15:22:55 2016
New Revision: 1725740
URL: http://svn.apache.org/viewvc?rev=1725740&view=rev
Log:
[OPENMEETINGS-794] invitations fix (first part)
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/chooseNickName.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1725740&r1=1725739&r2=1725740&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Wed Jan 20 15:22:55 2016
@@ -192,6 +192,7 @@
client.newScreenSharing = this.newScreenSharing;
client.stopScreenSharingMessage = this.stopScreenSharingMessage;
client.newRed5ScreenCursor = this.newRed5ScreenCursor;
+ client.nickNameSet = this.nickNameSet;
</handler>
<handler name="ondisconnect">
@@ -1496,19 +1497,18 @@
'',value.formatedDate,value.userpos,value.usercolor,value);
</method>
- <netRemoteCallHib name="nickNameSet" funcname="nickNameSet" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("nickNameSet: ", value);
- canvas.setAttribute('mail', value.email);
- canvas.setAttribute('firstName', value.firstname);
- canvas.setAttribute('lastName', value.lastname);
-
+ <method name="nickNameSet" args="value">
+ if ($debug) Debug.write("nickNameSet: ", value);
+ canvas.setAttribute('mail', value.email);
+ canvas.setAttribute('firstName', value.firstname);
+ canvas.setAttribute('lastName', value.lastname);
+ if (canvas._videocontainer) {
var vo = canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID);
if (vo != null) {
vo.update(value);
}
- </handler>
- </netRemoteCallHib>
+ }
+ </method>
<!-- Whiteboard sync Events -->
<method name="sendSyncFlag" args="value">
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/chooseNickName.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/chooseNickName.lzx?rev=1725740&r1=1725739&r2=1725740&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/chooseNickName.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/chooseNickName.lzx Wed Jan 20 15:22:55 2016
@@ -40,9 +40,9 @@
-->
<netRemoteCallHib name="setUserNickName" activeErrorHandler="true"
funcname="xmlcrm.setUserNickName" remotecontext="$once{ canvas.thishib }">
- <netparam><method name="getValue">return parent.parent.firstName.getText();</method></netparam>
- <netparam><method name="getValue">return parent.parent.lastName.getText();</method></netparam>
- <netparam><method name="getValue">return parent.parent.mail.getText();</method></netparam>
+ <netparam><method name="getValue">return parent.parent.firstName.text;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.lastName.text;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.mail.text;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
@@ -71,13 +71,13 @@
y="$once{ parent.height-30 }" labelid="1291" width="120" >
<handler name="onclick">
<![CDATA[
- if (parent.firstName.getText().length < 4) {
+ if (parent.firstName.text.length < 4) {
new lz.labelerrorPopup(canvas,{errorlabelid:1292});
return;
- } else if (parent.lastName.getText().length < 4) {
+ } else if (parent.lastName.text.length < 4) {
new lz.labelerrorPopup(canvas,{errorlabelid:1292});
return;
- } else if (parent.mail.getText() == "") {
+ } else if (parent.mail.text == "") {
new lz.labelerrorPopup(canvas,{errorlabelid:1293});
return;
}