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 2022/08/14 13:09:55 UTC
[royale-asjs] branch develop updated: This should return better results
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 8648fb0c29 This should return better results
8648fb0c29 is described below
commit 8648fb0c29148958d0ac3e0aaf5fbabc7d3f0caa
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Aug 14 16:09:50 2022 +0300
This should return better results
---
.../apache/royale/html/util/getLabelFromData.as | 26 ++++++++--------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as
index 1581f0c21b..5e41eae521 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as
@@ -50,31 +50,23 @@ package org.apache.royale.html.util
if (data is String) return "" + data;
if(!data) return "";
if(data is ILabeledData) return (data as ILabeledData).label;
- if (obj is IHasLabelField &&
- (obj as IHasLabelField).labelField &&
- data[(obj as IHasLabelField).labelField] != null)
+ if (obj is IHasLabelField && (obj as IHasLabelField).labelField)
{
- return "" + data[(obj as IHasLabelField).labelField];
+ return data[(obj as IHasLabelField).labelField] == null ?
+ "" :
+ "" + data[(obj as IHasLabelField).labelField];
}
-
- if (obj is IHasDataField &&
- (obj as IHasDataField).dataField &&
- data[(obj as IHasDataField).dataField] != null)
+
+ if (obj is IHasDataField && (obj as IHasDataField).dataField)
{
- return "" + data[(obj as IHasDataField).dataField];
+ return data[(obj as IHasDataField).dataField] == null ?
+ "" :
+ "" + data[(obj as IHasDataField).dataField];
}
var label:String = data["label"];
if(label != null)
- {
return label;
- }
-
- if (obj is IHasLabelField && (obj as IHasLabelField).labelField &&
- (data[(obj as IHasLabelField).labelField] == null || data[(obj as IHasLabelField).labelField] == undefined))
- {
- return "";
- }
return "" + data;