Repository: flex-asjs Updated Branches: refs/heads/develop 01a2a2823 -> a81e88163
Revert "Fix merge error removing support for numeric font size." This reverts commit 68f118b1a56a49484c4e898826af4834c0cc2fa2. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a81e8816 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a81e8816 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a81e8816 Branch: refs/heads/develop Commit: a81e88163e403ccdbc028b8ec191af6453fc8696 Parents: 01a2a28 Author: Justin Mclean <jmcl...@apache.org> Authored: Sat Jul 8 16:43:27 2017 +1000 Committer: Justin Mclean <jmcl...@apache.org> Committed: Sat Jul 8 16:43:27 2017 +1000 ---------------------------------------------------------------------- .../flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a81e8816/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 740e6ab..36198f6 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 @@ -764,13 +764,7 @@ package org.apache.flex.core 'constructor': 1 }; - /** - * The styles that can use raw numbers - */ - COMPILE::JS - public static const numericStyles:Object = { - 'fontWeight': 1 - }; + /** * @param thisObject The object to apply styles to; @@ -783,7 +777,6 @@ package org.apache.flex.core var styleList:Object = SimpleCSSValuesImpl.perInstanceStyles; var colorStyles:Object = SimpleCSSValuesImpl.colorStyles; var skipStyles:Object = SimpleCSSValuesImpl.skipStyles; - var numericStyles:Object = SimpleCSSValuesImpl.numericStyles; var listObj:Object = styles; if (styles.styleList) listObj = styles.styleList; @@ -798,8 +791,6 @@ package org.apache.flex.core if (typeof(value) == 'number') { if (colorStyles[p]) value = CSSUtils.attributeFromColor(value); - else if (numericStyles[p]) - value = value.toString(); else value = value.toString() + 'px'; }
