Author: solomax
Date: Mon Feb 8 12:50:04 2016
New Revision: 1729158
URL: http://svn.apache.org/viewvc?rev=1729158&view=rev
Log:
[OPENMEETINGS-1322] clear chat works as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.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=1729158&r1=1729157&r2=1729158&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
Mon Feb 8 12:50:04 2016
@@ -195,6 +195,9 @@
client.stopPublishingMessage = this.stopPublishingMessage;
client.newRed5ScreenCursor = this.newRed5ScreenCursor;
client.nickNameSet = this.nickNameSet;
+ client.clearChatContent = this.clearChatContent;
+ client.startedPublishing = this.startedPublishing;
+ client.newPoll = this.newPoll;
</handler>
<handler name="ondisconnect">
@@ -1383,24 +1386,15 @@
]]>
</method>
- <netRemoteCallHib name="newPoll" funcname="newPoll">
- <switch>
- <when property="$as3">
- <passthrough>
- import
flash.external.ExternalInterface;
- </passthrough>
- </when>
- </switch>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called by the
rtmpconnection
- if ($debug) Debug.write("newPoll : ", value);
- if (canvas.userId != value.createdBy.id) {
- ExternalInterface.call("vote",
canvas.publicSID);
- }
- ]]>
- </handler>
- </netRemoteCallHib>
+ <method name="newPoll" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called by the rtmpconnection
+ if ($debug) Debug.write("newPoll : ", value);
+ if (canvas.userId != value.createdBy.id) {
+ ExternalInterface.call("vote", canvas.publicSID);
+ }
+ ]]>
+ </method>
<method name="sendVarsToModeratorGeneral" args="value">
<![CDATA[
@@ -1415,15 +1409,6 @@
]]>
</method>
- <!-- recordContentings Notifications -->
- <netRemoteCallHib name="stopedRecording" funcname="stopedRecording" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("stopedRecording: ",value);
- canvas._mymod.recordingUser = null;
- canvas._mymod.setMessage();
- </handler>
- </netRemoteCallHib>
-
<method name="startedRecording" args="value">
if ($debug) Debug.write("startedRecording: ",value);
canvas._mymod.recordingUser = value;
@@ -1441,13 +1426,11 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="startedPublishing" funcname="startedPublishing"
>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("startedPublishing: ", value);
- canvas._mymod.publishingObj = {user: value[0], url:
value[1]};
- canvas._mymod.setMessage();
- </handler>
- </netRemoteCallHib>
+ <method name="startedPublishing" args="value">
+ if ($debug) Debug.write("startedPublishing: ", value);
+ canvas._mymod.publishingObj = {user: value[0], url: value[1]};
+ canvas._mymod.setMessage();
+ </method>
<method name="roomConnect" args="value">
if ($debug) Debug.write("roomConnect: ",value);
@@ -1526,14 +1509,12 @@
]]>
</method>
- <netRemoteCallHib name="clearChatContent" funcname="clearChatContent">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the
rtmpconnection
- canvas._chatcontent.reload();
- ]]>
- </handler>
- </netRemoteCallHib>
+ <method name="clearChatContent" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ canvas._chatcontent.reload();
+ ]]>
+ </method>
<netRemoteCallHib name="setCanGiveAudio"
funcname="whiteboardservice.setCanGiveAudio"
remotecontext="$once{ canvas.thishib }">
