flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - handle missing global selector
Date Mon, 04 Nov 2013 18:36:06 GMT
Updated Branches:
  refs/heads/develop de4222b4f -> 0046a4017


handle missing global selector


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

Branch: refs/heads/develop
Commit: 0046a401704d70f76ef8fb4b91813202c2441478
Parents: de4222b
Author: Alex Harui <aharui@apache.org>
Authored: Mon Nov 4 10:35:52 2013 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Nov 4 10:36:01 2013 -0800

----------------------------------------------------------------------
 frameworks/as/defaults.css                                  | 5 +++++
 .../as/src/org/apache/flex/core/SimpleCSSValuesImpl.as      | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0046a401/frameworks/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/defaults.css b/frameworks/as/defaults.css
index 5681af4..c17b3a6 100644
--- a/frameworks/as/defaults.css
+++ b/frameworks/as/defaults.css
@@ -73,6 +73,11 @@ Alert
     border-thickness: 1;
 }
 
+Button
+{
+    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSButtonView");
+}
+
 ButtonBar
 {
     IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0046a401/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
index fdaec8f..8ab5a45 100644
--- a/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -234,9 +234,12 @@ package org.apache.flex.core
 				thisObject = getDefinitionByName(className);
 			}
             o = values["global"];
-			value = o[valueName];
-			if (value !== undefined)
-				return value;
+            if (o)
+            {
+    			value = o[valueName];
+    			if (value !== undefined)
+    				return value;
+            }
 			o = values["*"];			
 			return o[valueName];
 		}


Mime
View raw message