Author: solomax
Date: Tue Nov 24 04:41:11 2015
New Revision: 1716024
URL: http://svn.apache.org/viewvc?rev=1716024&view=rev
Log:
[OPENMEETINGS-1279] chat somehow works
Added:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/resources/email_add.png
(with props)
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/library.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx?rev=1716024&r1=1716023&r2=1716024&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
Tue Nov 24 04:41:11 2015
@@ -129,52 +129,23 @@
if (!canvas.isrtl) {
tf.wordWrap = false;
var tFormat:TextFormat = tf.getTextFormat();
- //if ($debug) Debug.write(tFormat);
tFormat.leading = 4;
tf.setTextFormat(tFormat);
var items = parent.messageObj;
+ if ($debug) Debug.write("items :: ", items,
parent.leading);
var t = "";
- //items[0] = ["text","hello your are the hero
lets check accomodation today i need some input"];
for (var i = 0; i < items.length; ++i) {
- //if ($debug) Debug.write("Item :0:
",items[i][0]);
if (items[i][0] == "text") {
//if ($debug) Debug.write("Text
:1: ",items[i][1]);
t += items[i][1];
} else {
- if (t.length != 0) {
- var tempString =
calcLineWidthByTextField(this.width, t,this.fontsize,this.font);
- var x =
tempString[tempString.length-1]["lineWidth"];
- var y =
(tempString.length-1)*(getLineHeight()+parent.leading-1);
- } else {
- var x = 0;
- var y = 0;
- }
- t += items[i][2];
-
- var swfurl = canvas.getUrl() +
'public/emoticons/'+items[i][1];
- var m = new
lz.chatInnerSmily(parent,{x:x+this.x,y:y+this.y,iconlabel:items[i][3]});
-
- //if ($debug)
Debug.write("Smily :2: ",swfurl);
-
- m.setSource(swfurl);
+ t += "<img src='" +
canvas.getUrl() + 'public/emoticons/'+items[i][1] + "' alt='" + items[i][3] +
"'/>"; //items[i][2];
}
}
- //Debug.write("TTTT: ",t);"Verdana"
- var tString =
calcLineWidthByTextField(this.width, t,this.fontsize,this.font);
- for (var k = 0; k < tString.length; ++k) {
-
this.setAttribute('text',this.getText()+textObject[k]["text"]+"\r");
- //if ($debug) Debug.write("text:
",k,textObject[k]["lineWidth"],textObject[k]["text"]);
- }
-
- //if ($debug) Debug.write("text:
",this.getText());
- //Debug.write(tFormat);
tFormat.leading = parent.leading;
tf.setTextFormat(tFormat);
- //Debug.write(this.textHeight);
- //Debug.write(getLineHeight());
- //Debug.write(this.textHeight+12);
- this.setAttribute('height',this.textHeight+12);
+ if ($debug) Debug.write("text::oninit 0");
} else {
var t = "";
var items = parent.messageObj;
@@ -184,12 +155,12 @@
t += items[i][1];
}
}
- this.setAttribute('text',this.getText()+ t);
}
- parent.setAttribute('height',this.height);
- parent.header_user.setAttribute('height',this.height);
- parent.bg.setAttribute('height',this.height-1);
- parent.bg_main.setAttribute('height',this.height-1);
+ this.setAttribute('text', t);
+ parent.header_user.setAttribute('height', this.height);
+ parent.bg.setAttribute('height', this.height - 1);
+ parent.bg_main.setAttribute('height', this.height - 1);
+ if ($debug) Debug.write("text::oninit 4", t, this,
parent);
]]>
</handler>
</text>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/library.lzx?rev=1716024&r1=1716023&r2=1716024&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/library.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/library.lzx
Tue Nov 24 04:41:11 2015
@@ -24,6 +24,8 @@
<resource name="copy_chat_log_rsc" src="resources/edit-copy.png" />
<resource name="smile_chat_log_rsc" src="resources/smile.swf" />
<resource name="start_conference2_rsc" src="resources/connect.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="private_message_add_rsc" src="resources/email_add.png"
/>
<include href="simpleBaseTabpane.lzx" />
<include href="showChatLog.lzx" />
Added:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/resources/email_add.png
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/resources/email_add.png?rev=1716024&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/resources/email_add.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
