Author: vdegtyarev Date: Fri Nov 27 12:46:43 2015 New Revision: 1716868 URL: http://svn.apache.org/viewvc?rev=1716868&view=rev Log: OPENMEETINGS-1279: OmMiniIcon class is used instead of view to display emotic and clipart icons.
Added: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx?rev=1716868&r1=1716867&r2=1716868&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx Fri Nov 27 12:46:43 2015 @@ -31,6 +31,7 @@ <include href="labelRadioButton.lzx" /> <include href="labeltabelement.lzx" /> <include href="omImage.lzx" /> + <include href="omMiniIcon.lzx" /> <include href="scrollbars/" /> <include href="text/" /> Added: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx?rev=1716868&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx (added) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx Fri Nov 27 12:46:43 2015 @@ -0,0 +1,57 @@ +<?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. + +--> +<library> + +<class name="omMiniIcon" extends="view" width="22" height="22"> + <switch> + <when property="$as3"> + <passthrough> + import flash.net.*; + import flash.display.*; + </passthrough> + </when> + </switch> + + <attribute name="imgUrl" value="" type="string" /> + + <handler name="oninit"> + this.sprite.resource = imgUrl; + if (! this.sprite.imgLoader) { + if (this.sprite.resourceContainer) { + // unload previous internal image-resource + this.sprite.unload(); + } + this.sprite.imgLoader = new Loader(); + this.sprite.imgLoader.mouseEnabled = false;// @devnote: see LPP-7022 + this.sprite.imgLoader.mouseChildren = false; + this.sprite.resourceContainer = this.sprite.imgLoader; + this.sprite.addChild(this.sprite.imgLoader); + } + var res:Loader = this.sprite.imgLoader; + if (res) { + //res.scaleX = res.scaleY = 1.0; + } + + this.sprite.imgLoader.load(new URLRequest(imgUrl), LzSprite.loaderContext); + </handler> +</class> + +</library> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx?rev=1716868&r1=1716867&r2=1716868&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx Fri Nov 27 12:46:43 2015 @@ -103,38 +103,9 @@ </class> <!--- private class of emotIconsSelector.class. resource view of chat smily icons. it shows icons and label tooltips.--> -<class name="_chatInnerSmilyIcon" extends="view" onmouseover="" onmouseout="" width="16" height="16"> - <switch> - <when property="$as3"> - <passthrough> - import flash.net.*; - import flash.display.*; - </passthrough> - </when> - </switch> +<class name="_chatInnerSmilyIcon" extends="omMiniIcon" onmouseover="" onmouseout="" width="16" height="16"> <attribute name="iconlabel" value="" type="string" /> <attribute name="iconvalue" value="" type="string" /> - <attribute name="imgUrl" value="" type="string" /> - <handler name="oninit"> - this.sprite.resource = imgUrl; - if (! this.sprite.imgLoader) { - if (this.sprite.resourceContainer) { - // unload previous internal image-resource - this.sprite.unload(); - } - this.sprite.imgLoader = new Loader(); - this.sprite.imgLoader.mouseEnabled = false;// @devnote: see LPP-7022 - this.sprite.imgLoader.mouseChildren = false; - this.sprite.resourceContainer = this.sprite.imgLoader; - this.sprite.addChild(this.sprite.imgLoader); - } - var res:Loader = this.sprite.imgLoader; - if (res) { - res.scaleX = res.scaleY = 1.0; - } - - this.sprite.imgLoader.load(new URLRequest(imgUrl), LzSprite.loaderContext); - </handler> <handler name="onclick"> var messageBox = parent.parent.parent.btnRef.message; Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx?rev=1716868&r1=1716867&r2=1716868&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx Fri Nov 27 12:46:43 2015 @@ -20,7 +20,7 @@ --> <library> -<class name="miniIconSmybolExtraIcons" extends="view" width="22" height="22"> +<class name="miniIconSmybolExtraIcons" extends="omMiniIcon" width="22" height="22"> <attribute name="modi" value="" type="string"/> @@ -262,7 +262,7 @@ if ($debug) Debug.write("this.refToolbar :: ",this.refToolbar); - this.refToolbar._rscIcon.setSource(imageurl); + this.refToolbar._rscIcon.setAttribute("src", imageurl); this.refToolbar.parent.parent.parent.setSelection(this.refToolbar); @@ -332,7 +332,7 @@ new lz.miniIconSmybolExtraIcons(this,{ modi:list[i], - resource:iconresourceName, + imgUrl:iconresourceName, stretches:'both' });