flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [6/7] git commit: [flex-asjs] [refs/heads/develop] - temporary fix for null/unresolved issues between AS/JS
Date Sat, 03 Jun 2017 01:43:49 GMT
temporary fix for null/unresolved issues between AS/JS


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2af9ded8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2af9ded8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2af9ded8

Branch: refs/heads/develop
Commit: 2af9ded85cb047c3b74407bd381fd8187eba7ed8
Parents: 256dcd7
Author: Justin Mclean <jmclean@apache.org>
Authored: Sat Jun 3 11:42:30 2017 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Sat Jun 3 11:42:30 2017 +1000

----------------------------------------------------------------------
 .../main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2af9ded8/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index a4e4e1d..5e3a6c4 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -336,7 +336,8 @@ package org.apache.flex.core
 			if (thisObject is IStyleableObject)
 			{
                 var styleable:IStyleableObject = IStyleableObject(thisObject);
-                if (styleable.style !== undefined)
+                // undefined in JS null in AS
+                if (styleable.style != null)
                 {
                     value = styleable.style[valueName];
                     if (value === INHERIT)
@@ -344,7 +345,8 @@ package org.apache.flex.core
                     if (value !== undefined)
                         return value;
                 }
-                if (styleable.id !== undefined)
+                // undefined in JS null in AS
+                if (styleable.id != null)
                 {
                     o = values["#" + styleable.id];
                     if (o !== undefined)
@@ -357,7 +359,8 @@ package org.apache.flex.core
                     }                    
                 }
 				var classNames:String = styleable.className;
-                if (classNames !== undefined)
+                // undefined in JS null in AS
+                if (classNames != null)
                 {
                     var classNameList:Array = classNames.split(" ");
                     for each (className in classNameList)


Mime
View raw message