Author: solomax
Date: Mon Feb 8 11:18:27 2016
New Revision: 1729135
URL: http://svn.apache.org/viewvc?rev=1729135&view=rev
Log:
[OPENMEETINGS-1322] chat works as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx?rev=1729135&r1=1729134&r2=1729135&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx
Mon Feb 8 11:18:27 2016
@@ -96,11 +96,13 @@
this.currentBtn = btn;
this.currentBtn.objRef.setAttribute("visibility","visible");
this.currentBtn.objRef.bringToFront();
- if ($debug) //Debug.write("sendActiveWindow2: ",this.currentBtn);
+ //if ($debug) Debug.write("sendActiveWindow2: ",this.currentBtn);
this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
this.currentBtn._minimizebtn_dn.setAttribute('visibility','visible');
this.currentBtn.isactive=true;
- this.currentBtn.objRef.sendActiveWindow();
+ if (!!this.currentBtn.objRef.sendActiveWindow) {
+ this.currentBtn.objRef.sendActiveWindow();
+ }
]]>
</method>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1729135&r1=1729134&r2=1729135&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
Mon Feb 8 11:18:27 2016
@@ -129,13 +129,13 @@
<handler name="onisopen" args="o"><![CDATA[
if ($debug) Debug.write("onisopen", o,
canvas._chatcontent);
- canvas.chatHeight = o ? 200 : 222;
+ canvas.chatHeight = !!o ? 200 : 222;
canvas.commonVideoViewContent.hideChatContent(!o);
if (o) {
- if (canvas._chatcontent != null &&
'doInitByOpen' in canvas._chatcontent) {
+ if (!!canvas._chatcontent &&
!!canvas._chatcontent.doInitByOpen) {
canvas._chatcontent.doInitByOpen();
}
- if (canvas.currentRoomObj != null) {
+ if (!!canvas.currentRoomObj) {
content._content1._chattabbottom.updatefontbuttonvisible();
}
this.doBlink = false;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1729135&r1=1729134&r2=1729135&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
Mon Feb 8 11:18:27 2016
@@ -26,25 +26,25 @@
clip="true" width="${ parent.width-1 }" bgcolor="0xFFFFFF">
<attribute name="isAlreadyLoaded" value="false" type="boolean"/>
-<!---
- Invoked from VideoContainer cause domain/room must be set first
- -->
- <method name="doInitByOpen">
- <![CDATA[
- if (!this.isAlreadyLoaded) {
- this.isAlreadyLoaded = true;
- this._cbtext.clearChatOutput();
- this.getRoomChatHistory.doCall();
- }
- ]]>
- </method>
-
- <method name="reload">
- <![CDATA[
- this._cbtext.clearChatOutput();
- this.getRoomChatHistory.doCall();
- ]]>
- </method>
+ <!---
+ Invoked from VideoContainer cause domain/room must be set first
+ -->
+ <method name="doInitByOpen">
+ <![CDATA[
+ if (!this.isAlreadyLoaded) {
+ this.isAlreadyLoaded = true;
+ this._cbtext.clearChatOutput();
+ this.getRoomChatHistory.doCall();
+ }
+ ]]>
+ </method>
+
+ <method name="reload">
+ <![CDATA[
+ this._cbtext.clearChatOutput();
+ this.getRoomChatHistory.doCall();
+ ]]>
+ </method>
<netRemoteCallHib name="getRoomChatHistory"
funcname="chatservice.getRoomChatHistory"
remotecontext="$once{ canvas.thishib }" >
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1729135&r1=1729134&r2=1729135&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
Mon Feb 8 11:18:27 2016
@@ -119,15 +119,15 @@
<method name="doFullFit" args="v">
<![CDATA[
- if ($debug) Debug.write("Do Full Fit ? doFullFit: ", v);
- if ($debug) Debug.write(this.ObjectByName);
+ if ($debug) Debug.write("Do Full Fit ? doFullFit: ", v,
this.ObjectByName);
this.fullFit = v;
-
- if (this.ObjectByName && this.ObjectByName.typeOfObject=="swf")
{
+ if (!!this.ObjectByName && this.ObjectByName.typeOfObject ==
"swf") {
if (v) {
- if ($debug) Debug.write("Do Full Fit !");
- this.ObjectByName._swfView.initialLoadFullFit();
+ if ($debug) Debug.write("Do Full Fit ! ",
(!!this.ObjectByName._swfView));
+ if (!!this.ObjectByName._swfView) {
+
this.ObjectByName._swfView.initialLoadFullFit();
+ }
}
}
]]>
