Author: solomax
Date: Wed Aug 8 07:38:41 2012
New Revision: 1370684
URL: http://svn.apache.org/viewvc?rev=1370684&view=rev
Log:
OPENMEETINGS-363 is fixed
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/privateChatTabBottom.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1370684&r1=1370683&r2=1370684&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Wed Aug 8 07:38:41 2012
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file
to
- you under the Apache License, Version 2.0 (the "License"); you may not
use
- this file except in compliance with the License. You may obtain a copy
of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
- by applicable law or agreed to in writing, software distributed under
the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
- OF ANY KIND, either express or implied. See the License for the
specific
- language governing permissions and limitations under the License. -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:tx="http://www.springframework.org/schema/tx";
xmlns:mvc="http://www.springframework.org/schema/mvc";
xmlns:context="http://www.springframework.org/schema/context";
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1370684&r1=1370683&r2=1370684&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
Wed Aug 8 07:38:41 2012
@@ -46,16 +46,18 @@
var publicSID = value[1];
if ($debug) Debug.write("closeprivatechat _1b_ ",publicSID);
- for (var eg in this.content.chatbar.subviews) {
-
- if ($debug) Debug.write("closeprivatechat _2A_
",this.content.chatbar.subviews[eg].objRef);
- if ($debug) Debug.write("closeprivatechat _2B_
",this.content.chatbar.subviews[eg].objRef.refObj);
- if ($debug) Debug.write("closeprivatechat _2C_
",this.content.chatbar.subviews[eg].objRef.refObj.publicSID);
-
- if (this.content.chatbar.subviews[eg].objRef.refObj.publicSID
== publicSID ) {
-
this.content.chatbar.removeObjectSynced(this.content.chatbar.subviews[eg]);
- return;
- }
+ for (var eg in this.content.chatbar.subviews) {
+ if(typeof
this.content.chatbar.subviews[eg].objRef.refObj == 'undefined') {
+ continue;
+ }
+ if ($debug) Debug.write("closeprivatechat _2A_
",this.content.chatbar.subviews[eg].objRef);
+ if ($debug) Debug.write("closeprivatechat _2B_
",this.content.chatbar.subviews[eg].objRef.refObj);
+ if ($debug) Debug.write("closeprivatechat _2C_
",this.content.chatbar.subviews[eg].objRef.refObj.publicSID);
+
+ if
(this.content.chatbar.subviews[eg].objRef.refObj.publicSID == publicSID ) {
+
this.content.chatbar.removeObjectSynced(this.content.chatbar.subviews[eg]);
+ return;
+ }
}
</method>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx?rev=1370684&r1=1370683&r2=1370684&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
Wed Aug 8 07:38:41 2012
@@ -25,12 +25,7 @@ Chat tabpane class. It contains chatOutp
This is used in the conference.
-->
<class name="chatTab" extends="simpleBaseTabpane" bgcolor="$once{
canvas.getThemeColor('mainBackgroundColor') }" x="0">
-
- <!--
- bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }"
- -->
-
- <view name="_chatoutputborder" x="4" height="${ parent.height-46 }"
width="${ parent.width-4 }"
+ <view name="_chatoutputborder" height="${ parent.height-48 }" width="${
parent.width-2 }"
bgcolor="$once{
canvas.getThemeColor('secondBorderColor') }">
<chatOutput name="_chatoutput" x="1" y="1" >
@@ -38,12 +33,10 @@ This is used in the conference.
canvas._chatcontent = this;
</handler>
</chatOutput>
-
</view>
<chatTabBottom name="_chattabbottom"
- y="${ parent.height-42 }" x="4" width="${
parent.width-6 }" />
-
+ y="${ parent.height-46 }" x="0" width="${
parent.width-2 }" />
</class>
@@ -83,14 +76,10 @@ This is used in the conference.
<view name="_chatoutputborder" height="${ parent.height-48 }"
bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" width="${
parent.width-2 }">
- <chatOutput name="_chatoutput" x="1" y="1" >
-
- </chatOutput>
-
+ <chatOutput name="_chatoutput" x="1" y="1" />
</view>
- <privateChatTabBottom name="_chattabbottom"
+ <chatTabBottom name="_chattabbottom" isPrivate="true"
y="${ parent.height-46 }" x="0" width="${
parent.width-2 }" />
-
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx?rev=1370684&r1=1370683&r2=1370684&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
Wed Aug 8 07:38:41 2012
@@ -20,19 +20,20 @@
-->
<library>
-<!--- View of the buttom area of chat. It contains buttons of
message,emoticons,clear. -->
-<class name="chatTabBottom" extends="view" height="42">
-
- <view x="0" y="0" height="20" width="${ parent.width-2 }"
name="message"
- bgcolor="0xBBBBBB">
+ <!--- View of the buttom area of chat. It contains buttons of
message,emoticons,clear. -->
+ <class name="chatTabBottom" extends="view" height="42">
+ <attribute name="isPrivate" value="false" type="boolean" />
+
+ <view x="0" y="0" height="20" width="${ parent.width-2 }"
name="message"
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer')
}">
<method name="getText">
return this._ctext.getText();
</method>
<method name="setText" args="txt">
this._ctext.setAttribute('text',txt);
</method>
- <customInputtext name="_ctext" width="${ parent.width-2
}" height="$once{ parent.height-2 }"
- x="1" y="1" bgcolor="white" >
+ <customInputtext name="_ctext" width="${ parent.width-2
}"
+ height="$once{ parent.height-2 }" x="1" y="1"
bgcolor="white">
<handler name="onkeyup" args="key">
<![CDATA[
var reverse = canvas.reverseAll(parent.getText());
@@ -43,128 +44,143 @@
this.parent._button.onclick.sendEvent();
}
]]>
- </handler>
- </customInputtext>
-
+ </handler>
+ </customInputtext>
+
<attribute name="objMessage" value="null" />
-
- <simpleLabelButton name="_button" labelid="220" height="21"
width="80"
- x="$once{ parent.width-80 }" >
- <handler name="onclick">
- parent.objMessage = new Array ();
- parent.objMessage[0] = 'chat';
- //The server side will put time here
- parent.objMessage[1] = "";
- //Debug.write("Setting Message");
- parent.objMessage[2] = 'newtextmessage';
- parent.objMessage[3] = hib.userobject.login;
- var message = this.parent.getText();
- //if (parent.parent._inverseWording.getValue()) message
= canvas.reverseAll(message)
- parent.objMessage[4] = message;
- parent.objMessage[5] = canvas.currentusercolor;
- parent.objMessage[6] = canvas.publicSID;
- parent.objMessage[7] = canvas.isrtl;
- parent.objMessage[8] = hib.userobject.user_id;
- if (this.parent.getText().length!=0){
- //Debug.write("send: ",this.parent.objMessage);
- parent.sendMessageWithClient.doCall();
- this.parent.setText('');
- }
- </handler>
- </simpleLabelButton>
-
- <netRemoteCallHib name="sendMessageWithClient"
funcname="chatservice.sendMessageWithClient"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue"> return
parent.parent.objMessage; </method></netparam>
- <handler name="ondata" args="value">
+
+ <simpleLabelButton name="_button" labelid="220"
+ height="21" width="80" x="$once{
parent.width-80 }">
+ <handler name="onclick">
+ var message = this.parent.getText();
+ if (message.length != 0) {
+ parent.objMessage = new Array();
+ var om = parent.objMessage;
+ om[0] = parent.parent.isPrivate
? 'privatechat' : 'chat';
+ //The server side will put time
here
+ om[1] = "";
+ //if ($debug)
Debug.write("Setting Message");
+ om[2] = 'newtextmessage';
+ om[3] = hib.userobject.login;
+ //if
(parent.parent._inverseWording.getValue()) message = canvas.reverseAll(message)
+ om[4] = message;
+ om[5] = canvas.currentusercolor;
+ om[6] = parent.parent.isPrivate
? parent.parent.parent.refObj.publicSID : canvas.publicSID;
+ om[7] = canvas.isrtl;
+ om[8] = hib.userobject.user_id;
+ if ($debug) Debug.write("send:
", parent.parent.parent);
+ if (parent.parent.isPrivate) {
+
parent.sendMessageWithClientByPublicSID.doCall();
+ } else {
+
parent.sendMessageWithClient.doCall();
+ }
+ this.parent.setText('');
+ }
+ </handler>
+ </simpleLabelButton>
+
+ <netRemoteCallHib name="sendMessageWithClient"
+ funcname="chatservice.sendMessageWithClient"
remotecontext="$once{ canvas.thishib }">
+ <netparam><method name="getValue">return
parent.parent.objMessage;</method></netparam>
+ <handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
if ($debug)
Debug.write("chatservice.sendMessageWithClient getValue : ",value);
]]>
- </handler>
- </netRemoteCallHib>
-
+ </handler>
+ </netRemoteCallHib>
+ <netRemoteCallHib
name="sendMessageWithClientByPublicSID"
+
funcname="chatservice.sendMessageWithClientByPublicSID" remotecontext="$once{
canvas.thishib }">
+ <netparam><method name="getValue">return
parent.parent.objMessage;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.parent.parent.refObj.publicSID;</method></netparam>
+ <handler name="ondata" args="value">
+ //The onResult-Handler will be called
be the rtmpconnection
+ if ($debug)
Debug.write("chatservice.sendMessageWithClientByPublicSID getValue : ",value);
+ </handler>
+ </netRemoteCallHib>
</view>
-
- <labelCheckbox name="_inverseWording" x="2" y="24" labelid="580">
- <attribute name="doUpdate" value="false" type="boolean" />
- <handler name="oninit">
- var g = canvas.getUserData();
- var save = g["rtlCheckbox"];
- //if ($debug) Debug.write("oninit doUpdate",save,g);
- if(save) {
- this.doUpdate = false;
- this.setValue(true);
- }
- this.doUpdate = true;
- </handler>
- <handler name="onvalue" args="v">
- if (this.doUpdate) {
- //if ($debug) Debug.write("onvalue doUpdate",this.getValue());
- var g = canvas.getUserData();
- g["rtlCheckbox"]=this.getValue();
- //if ($debug) Debug.write("onvalue doUpdate",g["rtlCheckbox"]);
- canvas.setUserData(g);
- }
- </handler>
- <labelTooltip labelid="581" />
- </labelCheckbox>
-
- <view name="_button" width="140" y="22" align="right">
-
- <miniIcons y="2" x="82" resource="smile_chat_log_rsc" width="16"
height="16"
- showhandcursor="true">
- <handler name="onclick">
- var pick = new lz.emotIconsSelector(canvas,{
- btnRef:this.parent.parent,
- x:(this.getAttributeRelative('x',canvas)-140),
- y:(this.getAttributeRelative('y',canvas)-140)
- });
- lz.ModeManager.makeModal( pick );
- </handler>
- <labelTooltip labelid="445" />
- </miniIcons>
-
- <miniIcons y="2" x="102" resource="copy_chat_log_rsc" width="16"
height="16"
- showhandcursor="true">
- <handler name="onclick">
+
+ <labelCheckbox name="_inverseWording" x="2" y="24"
+ labelid="580">
+ <attribute name="doUpdate" value="false" type="boolean"
/>
+ <handler name="oninit">
+ var g = canvas.getUserData();
+ var save = g["rtlCheckbox"];
+ //if ($debug) Debug.write("oninit
doUpdate",save,g);
+ if(save) {
+ this.doUpdate = false;
+ this.setValue(true);
+ }
+ this.doUpdate = true;
+ </handler>
+ <handler name="onvalue" args="v">
+ if (this.doUpdate) {
+ //if ($debug) Debug.write("onvalue
doUpdate",this.getValue());
+ var g = canvas.getUserData();
+ g["rtlCheckbox"]=this.getValue();
+ //if ($debug) Debug.write("onvalue
doUpdate",g["rtlCheckbox"]);
+ canvas.setUserData(g);
+ }
+ </handler>
+ <labelTooltip labelid="581" />
+ </labelCheckbox>
+
+ <view name="_button" width="140" y="22" align="right">
+
+ <miniIcons y="2" x="82" resource="smile_chat_log_rsc"
+ width="16" height="16" showhandcursor="true">
+ <handler name="onclick">
+ var pick = new
lz.emotIconsSelector(canvas,{
+ btnRef:this.parent.parent,
+
x:(this.getAttributeRelative('x',canvas)-140),
+
y:(this.getAttributeRelative('y',canvas)-140)
+ });
+ lz.ModeManager.makeModal( pick );
+ </handler>
+ <labelTooltip labelid="445" />
+ </miniIcons>
+
+ <miniIcons y="2" x="102" resource="copy_chat_log_rsc"
+ width="16" height="16" showhandcursor="true"
visible="$once{ !parent.parent.isPrivate }">
+ <handler name="onclick">
<![CDATA[
var tString = canvas._chatcontent.getLog();
new lz.showChatLog(canvas,{
error:tString
});
]]>
- </handler>
- <labelTooltip labelid="1200" />
- </miniIcons>
-
- <miniIconsImage src="$once{ canvas.getThemeImage('button_cancel_rsc')
}"
- y="2" x="122" width="16" height="16"
showhandcursor="true">
- <handler name="onclick">
- if (!canvas.ismoderator) {
- //Do not allow
- new lz.labelerrorPopup(canvas,{errorlabelid:783});
- return;
- }
- parent.clearChat.doCall();
- </handler>
- <labelTooltip labelid="442" />
- </miniIconsImage>
-
- <view width="1" />
-
- <netRemoteCallHib name="clearChat" funcname="chatservice.clearChat"
- remotecontext="$once{ canvas.thishib }" >
- <handler name="ondata" args="value">
+ </handler>
+ <labelTooltip labelid="1200" />
+ </miniIcons>
+
+ <miniIconsImage src="$once{
canvas.getThemeImage('button_cancel_rsc') }"
+ y="2" x="122" width="16" height="16"
showhandcursor="true"
+ visible="$once{ !parent.parent.isPrivate }">
+ <handler name="onclick">
+ if (!canvas.ismoderator) {
+ //Do not allow
+ new
lz.labelerrorPopup(canvas,{errorlabelid:783});
+ return;
+ }
+ parent.clearChat.doCall();
+ </handler>
+ <labelTooltip labelid="442" />
+ </miniIconsImage>
+
+ <view width="1" />
+
+ <netRemoteCallHib name="clearChat"
funcname="chatservice.clearChat"
+ remotecontext="$once{ canvas.thishib }">
+ <handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("clearChat : ",value);
]]>
- </handler>
- </netRemoteCallHib>
-
- </view>
+ </handler>
+ </netRemoteCallHib>
+
+ </view>
-</class>
+ </class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx?rev=1370684&r1=1370683&r2=1370684&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
Wed Aug 8 07:38:41 2012
@@ -33,7 +33,6 @@
<include href="chatTabItemEmoticons.lzx" />
<include href="chatOutput.lzx" />
<include href="chatTabBottom.lzx" />
- <include href="privateChatTabBottom.lzx" />
<include href="chatTab.lzx" />
</library>
