Author: solomax
Date: Tue Dec 22 12:10:07 2015
New Revision: 1721378
URL: http://svn.apache.org/viewvc?rev=1721378&view=rev
Log:
[OPENMEETINGS-1305] room enter works better
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/rpcerrorDialog.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=1721378&r1=1721377&r2=1721378&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
Tue Dec 22 12:10:07 2015
@@ -165,7 +165,7 @@
}
//Load Session Data
- this.getsessiondata.callRPC();
+ this.getsessiondata.doCall();
}
connected = true;
client.setNewBroadCastingFlag = this.setNewBroadCastingFlag;
@@ -284,7 +284,7 @@
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
<handler name="ondata" args="value">
//if ($debug)
Debug.write("hibRtmpConnection/refreshSession [",value,"]");
- lz.Timer.addTimer( parent.refreshDelegate,
canvas.refreshSession );
+ lz.Timer.addTimer(parent.refreshDelegate,
canvas.refreshSession);
</handler>
</netRemoteCallHib>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/rpcerrorDialog.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/rpcerrorDialog.lzx?rev=1721378&r1=1721377&r2=1721378&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/rpcerrorDialog.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/rpcerrorDialog.lzx
Tue Dec 22 12:10:07 2015
@@ -44,8 +44,8 @@
<![CDATA[
if ($debug) Debug.write("getErrorByCode ",value);
//this.parent.destroy();
- this.parent.setAttribute('errortext',value.errmessage+"
<br/><br/>"+parent.addInfo);
- this.parent.setAttribute('title',value.errortype);
+ this.parent.setAttribute('errortext', value.message + "
<br/><br/>" + parent.addInfo);
+ this.parent.setAttribute('title', value.type);
]]>
</handler>
</netRemoteCallHib>