You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/31 23:24:12 UTC

[royale-asjs] branch develop updated: FontAwesomeToggleIcon: fix selectedType

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 c918017  FontAwesomeToggleIcon: fix selectedType
c918017 is described below

commit c918017dc6c89102d998214c002ba1cb0dbae1b8
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Apr 1 01:24:07 2020 +0200

    FontAwesomeToggleIcon: fix selectedType
---
 .../apache/royale/icons/FontAwesomeToggleIcon.as   | 40 +++++++---------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeToggleIcon.as b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeToggleIcon.as
index efba223..21d3491 100644
--- a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeToggleIcon.as
+++ b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeToggleIcon.as
@@ -68,7 +68,7 @@ package org.apache.royale.icons
             internalSelected();
         }
 
-        private var _selectedText:String = "";
+        private var _selectedType:String = "";
         /**
          *  The selectedText of the icon
          *  
@@ -77,41 +77,25 @@ package org.apache.royale.icons
          *  @playerversion AIR 2.6
          *  @productversion Royale 0.9.7
          */
-		public function get selectedText():String
+		public function get selectedType():String
 		{
-            return _selectedText;            
+            return _selectedType;            
 		}
-        public function set selectedText(value:String):void
+        public function set selectedType(value:String):void
 		{
-            _selectedText = value;
-            internalSelected();
-		}
-
-        override public function set text(value:String):void
-		{
-            _text = value;
+            _selectedType = value;
             internalSelected();
 		}
 
         private function internalSelected():void
         {
-            COMPILE::JS
-			{
-            textNode.textContent = _selected ? _selectedText : _text;	
-			}
-        }
-        
-        /**
-         *  The icon text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
-        override protected function get iconText():String
-        {
-            return selected ? selectedText : text;
+            removeClass('fa-' + _type);
+            removeClass('fa-' + _selectedType);
+
+            if(selected)
+                addClass('fa-' + _selectedType);
+            else
+                addClass('fa-' + _type);
         }
     }
 }