You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2020/01/15 10:28:14 UTC
[royale-asjs] branch develop updated: Fixes empty class names
pending discussion
This is an automated email from the ASF dual-hosted git repository.
harbs 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 b790db6 Fixes empty class names pending discussion
b790db6 is described below
commit b790db6c26c4671b0a06ab6636579327ea9e221d
Author: Harbs <ha...@in-tools.com>
AuthorDate: Wed Jan 15 12:27:57 2020 +0200
Fixes empty class names pending discussion
---
frameworks/projects/Basic/asconfig.json | 3 ++-
.../projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Basic/asconfig.json b/frameworks/projects/Basic/asconfig.json
index 6a2265a..f5f9348 100644
--- a/frameworks/projects/Basic/asconfig.json
+++ b/frameworks/projects/Basic/asconfig.json
@@ -20,7 +20,8 @@
"compilerOptions": {
"debug": true,
"targets": [
- "SWF", "JSRoyale"
+ "JSRoyale",
+ "SWF"
],
"include-classes": [
"BasicClasses"
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 ef1d4e6..84aeb0b 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
@@ -1065,7 +1065,7 @@ package org.apache.royale.core
// set it now if it was set once in addedToParent
// otherwise just wait for addedToParent
if (parent)
- setClassName(computeFinalClassNames());
+ setClassName(computeFinalClassNames());
}
dispatchEvent(new Event("classNameChanged"));
@@ -1326,7 +1326,9 @@ package org.apache.royale.core
COMPILE::JS
{
- setClassName(computeFinalClassNames());
+ var classNames:String = computeFinalClassNames().trim();
+ if(classNames)
+ setClassName(classNames);
if (style)
ValuesManager.valuesImpl.applyStyles(this, style);