You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2017/06/03 20:33:30 UTC
[18/25] git commit: [flex-asjs] [refs/heads/tlf] - de-hyphenate in
parsestyles so the lookup works in getValues
de-hyphenate in parsestyles so the lookup works in getValues
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ac362246
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ac362246
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ac362246
Branch: refs/heads/tlf
Commit: ac36224627d339fc83efcd81b0f79dc2a73da8f5
Parents: d6cb59b
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 1 11:47:18 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 2 00:04:48 2017 -0700
----------------------------------------------------------------------
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 22 ++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ac362246/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 7965712..0ab68bc 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
@@ -593,13 +593,23 @@ package org.apache.flex.core
for each (var part:String in parts)
{
var pieces:Array = StringUtil.splitAndTrim(part, ":");
+ var valueName:String = pieces[0];
+ var c:int = valueName.indexOf("-");
+ while (c != -1)
+ {
+ valueName = valueName.substr(0, c) +
+ valueName.charAt(c + 1).toUpperCase() +
+ valueName.substr(c + 2);
+ c = valueName.indexOf("-");
+ }
+
var value:String = pieces[1];
if (value == "null")
- obj[pieces[0]] = null;
+ obj[valueName] = null;
else if (value == "true")
- obj[pieces[0]] = true;
+ obj[valueName] = true;
else if (value == "false")
- obj[pieces[0]] = false;
+ obj[valueName] = false;
else
{
var n:Number = Number(value);
@@ -607,7 +617,7 @@ package org.apache.flex.core
{
if (value.charAt(0) == "#" || value.indexOf("rgb") == 0)
{
- obj[pieces[0]] = CSSUtils.toColor(value);
+ obj[valueName] = CSSUtils.toColor(value);
}
else
{
@@ -615,11 +625,11 @@ package org.apache.flex.core
value = value.substr(1, value.length - 2);
else if (value.charAt(0) == '"')
value = value.substr(1, value.length - 2);
- obj[pieces[0]] = value;
+ obj[valueName] = value;
}
}
else
- obj[pieces[0]] = n;
+ obj[valueName] = n;
}
}
return obj;