royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch develop updated: Revert "Change order in computeClassNames to get typenames before classNames (just for organization purposes in html output)"
Date Mon, 12 Mar 2018 19:06:49 GMT
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 28c6d2d  Revert "Change order in computeClassNames to get typenames before classNames
(just for organization purposes in html output)"
28c6d2d is described below

commit 28c6d2d931b67c6411ee669e6c8fa454e2f8bfe0
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Mon Mar 12 20:06:37 2018 +0100

    Revert "Change order in computeClassNames to get typenames before classNames (just for
organization purposes in html output)"
    
    This reverts commit 6063d82f336628f97273f1b3399b7aa73f7496b1.
---
 .../projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as     | 2 +-
 .../Core/src/main/royale/org/apache/royale/core/CSSClassList.as         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
index 19d886f..77ed10b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
@@ -1062,7 +1062,7 @@ package org.apache.royale.core
 		COMPILE::JS
         protected function computeFinalClassNames():String
 		{
-            return (typeNames ? typeNames : "") + (_className ? _className + " " : "");
+            return (_className ? _className + " " : "") + (typeNames ? typeNames : "");
 		}
 
         COMPILE::JS
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as
index c1c274a..80acd7d 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as
@@ -86,7 +86,7 @@ package org.apache.royale.core
          */
 		public function compute():String
 		{
-            return _list ? _list.join(" ") : "";
+            return _list ? _list.join(" ") + " " : "";
 		}
 	}
 }

-- 
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.

Mime
View raw message