Author: vdegtyarev
Date: Wed Nov 25 13:40:54 2015
New Revision: 1716403
URL: http://svn.apache.org/viewvc?rev=1716403&view=rev
Log:
OPENMEETINGS-1279: OmImage class is used instead of image to display user icon.
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx?rev=1716403&r1=1716402&r2=1716403&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
Wed Nov 25 13:40:54 2015
@@ -29,10 +29,13 @@
</passthrough>
</when>
</switch>
- <handler name="oninit">
+
+ <handler name="onsrc" method="loadOmSrc" />
+ <handler name="oninit" method="loadOmImage" />
+
+ <method name="loadOmImage" args="ignore">
<![CDATA[
- if (this.src != '' && this.src != null) {
- //if ($debug) Debug.write("omImage::oninit src ", this.src);
+ if (this.src != '' && this.src != null) {
this.sprite.resource = this.src;
if (! this.sprite.imgLoader) {
if (this.sprite.resourceContainer) {
@@ -51,9 +54,19 @@
}
this.sprite.imgLoader.load(new URLRequest(this.src),
LzSprite.loaderContext);
+ }
+ ]]>
+ </method>
+
+ <method name="loadOmSrc" args="src">
+ <![CDATA[
+ //if ($debug) Debug.write("omImage::loadOmSrc src ", src);
+ if (src != null) {
+ this.setSource( src );
+ loadOmImage(null);
}
]]>
- </handler>
+ </method>
</class>
</library>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx?rev=1716403&r1=1716402&r2=1716403&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx
Wed Nov 25 13:40:54 2015
@@ -41,7 +41,7 @@
<view width="$once{ parent.width }" height="$once{ parent.height-1 }"
bgcolor="0xFFFFFF" opacity="0.2" />
- <image name="_userpic" stretches="both" x="1" y="1">
+ <omImage name="_userpic" stretches="both" x="1" y="1">
<handler name="onload">
<![CDATA[
if (this.height > 38) {
@@ -52,7 +52,7 @@
}
]]>
</handler>
- </image>
+ </omImage>
<text text="$once{ parent.username }" x="40" resize="false"
width="$once{ parent.width - 40 }" />
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=1716403&r1=1716402&r2=1716403&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
Wed Nov 25 13:40:54 2015
@@ -94,7 +94,7 @@
opacity="0.1">
</view>
- <image name="_userpic" stretches="both" x="1" y="1">
+ <omImage name="_userpic" stretches="both" x="1" y="1">
<handler name="onload">
<![CDATA[
if (this.height > 38) {
@@ -110,7 +110,7 @@
}
]]>
</handler>
- </image>
+ </omImage>
<text text="$once{ parent.username }" x="40" resize="false"
fontsize="11" multiline="true"
width="140" height="$once{ parent.height }"
