flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: git commit: [flex-asjs] [refs/heads/develop] - Fix merge error removing support for numeric font size.
Date Thu, 29 Jun 2017 06:29:19 GMT
That's not a merge error.  That code is now in AllCSSValuesImpl and is not
needed in SimpleCSSValuesImpl.  Please follow the commits.

Thanks,
-Alex

On 6/28/17, 11:20 PM, "jmclean@apache.org" <jmclean@apache.org> wrote:

>Repository: flex-asjs
>Updated Branches:
>  refs/heads/develop 18992c5fd -> 68f118b1a
>
>
>Fix merge error removing support for numeric font size.
>
>
>Project: 
>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-us
>.apache.org%2Frepos%2Fasf%2Fflex-asjs%2Frepo&data=02%7C01%7C%7C54ae6d625dc
>94c6ed96e08d4beb6f83f%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C6363431
>40434742994&sdata=ajuLAIRntJH18PxMYM%2BlQhhtC%2BaVBA8uA0rJY9nP1%2Fc%3D&res
>erved=0
>Commit: 
>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-us
>.apache.org%2Frepos%2Fasf%2Fflex-asjs%2Fcommit%2F68f118b1&data=02%7C01%7C%
>7C54ae6d625dc94c6ed96e08d4beb6f83f%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%
>7C0%7C636343140434742994&sdata=7%2Bww%2FhSm8sxGI6MNf8l2RfBbK6tN9FrpR7kQthT
>tHtg%3D&reserved=0
>Tree: 
>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-us
>.apache.org%2Frepos%2Fasf%2Fflex-asjs%2Ftree%2F68f118b1&data=02%7C01%7C%7C
>54ae6d625dc94c6ed96e08d4beb6f83f%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C
>0%7C636343140434742994&sdata=BTgGfk7XE9PNBIbDm8%2BIbpghN1Orxl2krDE2UUTlugU
>%3D&reserved=0
>Diff: 
>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-us
>.apache.org%2Frepos%2Fasf%2Fflex-asjs%2Fdiff%2F68f118b1&data=02%7C01%7C%7C
>54ae6d625dc94c6ed96e08d4beb6f83f%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C
>0%7C636343140434742994&sdata=VqBJ4z1SXLo40Lt8URgDUyxBAbQd7s5ilAu4LfQSLGw%3
>D&reserved=0
>
>Branch: refs/heads/develop
>Commit: 68f118b1a56a49484c4e898826af4834c0cc2fa2
>Parents: 18992c5
>Author: Justin Mclean <jmclean@apache.org>
>Authored: Thu Jun 29 16:20:17 2017 +1000
>Committer: Justin Mclean <jmclean@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(-)
>----------------------------------------------------------------------
>
>
>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit-wip-us
>.apache.org%2Frepos%2Fasf%2Fflex-asjs%2Fblob%2F68f118b1%2Fframeworks%2Fpro
>jects%2FCore%2Fsrc%2Fmain%2Fflex%2Forg%2Fapache%2Fflex%2Fcore%2FSimpleCSSV
>aluesImpl.as&data=02%7C01%7C%7C54ae6d625dc94c6ed96e08d4beb6f83f%7Cfa7b1b5a
>7b34438794aed2c178decee1%7C0%7C0%7C636343140434742994&sdata=vCMPxmTgZtYhvN
>rmc9lf55fRtcJU%2B4%2F1QWADDR4qH7s%3D&reserved=0
>----------------------------------------------------------------------
>diff --git 
>a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSVal
>uesImpl.as 
>b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSVal
>uesImpl.as
>index f5d71ca..16b42c6 100644
>--- 
>a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSVal
>uesImpl.as
>+++ 
>b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSVal
>uesImpl.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';
>                 }
>

Mime
View raw message