[royale-asjs] branch develop updated: hasOwnProperty fails on getters

[ha...@apache.org]

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 6f5aabf  hasOwnProperty fails on getters
6f5aabf is described below

commit 6f5aabf78fb62eaad2904b59451a3f9804f61d0a
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Jan 7 20:34:30 2019 +0200

    hasOwnProperty fails on getters
---
 .../src/main/royale/org/apache/royale/html/util/getLabelFromData.as | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 617a483..f5853b4 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
@@ -34,8 +34,10 @@ package org.apache.royale.html.util
 
         if (obj["labelField"]) return "" + data[obj["labelField"]];
         if (obj["dataField"]) return "" + data[obj["dataField"]];
-        if (data.hasOwnProperty("label")) return "" + data["label"];
-
+        var label:String = data["label"];
+        if(label != null){
+            return label;
+        }
         return "" + data;
 
     }