[royale-asjs] branch develop updated: jewel-iconbutton: support latest css changes in icons for buttons and togglebuttons

[carlosrovira]

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 4275a72  jewel-iconbutton: support latest css changes in icons for 
buttons and togglebuttons
4275a72 is described below

commit 4275a726ba0cfb4425f47fc2a6572073b9b41028
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Sun Feb 23 14:01:36 2020 +0100

    jewel-iconbutton: support latest css changes in icons for buttons and 
togglebuttons
---
 .../src/main/royale/org/apache/royale/jewel/IconButton.as | 15 +++++----------
 .../org/apache/royale/jewel/supportClasses/bar/BarRow.as  |  5 -----
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
index 3b0f640..86cb79e 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButton.as
@@ -106,13 +106,8 @@ package org.apache.royale.jewel
         public function set icon(value:IIcon):void
         {
             _icon = value;
+            value ? addClass("icon") : removeClass("icon");
             setIconPosition();
-
-            COMPILE::SWF
-            {
-            classSelectorList.toggle("icon", (_icon != null));
-            // todo set up icon on swf
-            }
         }
 
         private var _rightPosition:Boolean;
@@ -143,12 +138,12 @@ package org.apache.royale.jewel
         {
             COMPILE::JS
             {
-            removeClass("iconRSpace");
-            removeClass("iconLSpace");
-            var iconClass:String = "icon";
+            removeClass("left-space");
+            removeClass("right-space");
+            var iconClass:String = "";
             if(text != "")
             {
-                iconClass += (rightPosition? "R" : "L" ) + "Space";
+                iconClass += (rightPosition? "right" : "left" ) + "-space";
             }
             addClass(iconClass);
             
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/bar/BarRow.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/bar/BarRow.as
index a3fbe84..89f9668 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/bar/BarRow.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/bar/BarRow.as
@@ -18,11 +18,6 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.supportClasses.bar
 {
-    COMPILE::JS
-    {
-        import org.apache.royale.core.WrappedHTMLElement;
-               import org.apache.royale.html.util.addElementToWrapper;
-    }
        import org.apache.royale.jewel.Group;
 
        /**