Repository: flex-asjs Updated Branches: refs/heads/develop 18992c5fd -> 68f118b1a
Fix merge error removing support for numeric font size. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/68f118b1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/68f118b1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/68f118b1 Branch: refs/heads/develop Commit: 68f118b1a56a49484c4e898826af4834c0cc2fa2 Parents: 18992c5 Author: Justin Mclean <jmcl...@apache.org> Authored: Thu Jun 29 16:20:17 2017 +1000 Committer: Justin Mclean <jmcl...@apache.org> Committed: Thu Jun 29 16:20:17 2017 +1000 ---------------------------------------------------------------------- .../flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/68f118b1/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 f5d71ca..16b42c6 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,7 +764,13 @@ 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; @@ -777,6 +783,7 @@ 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; @@ -791,6 +798,8 @@ 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'; }
