Return-Path: X-Original-To: apmail-incubator-flex-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33FE79AA6 for ; Sat, 22 Dec 2012 06:35:27 +0000 (UTC) Received: (qmail 87065 invoked by uid 500); 22 Dec 2012 06:35:27 -0000 Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org Received: (qmail 87033 invoked by uid 500); 22 Dec 2012 06:35:26 -0000 Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-commits@incubator.apache.org Received: (qmail 87023 invoked by uid 99); 22 Dec 2012 06:35:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Dec 2012 06:35:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,LOTS_OF_MONEY X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Dec 2012 06:35:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D0B5823888FE; Sat, 22 Dec 2012 06:35:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1425250 - in /incubator/flex/sdk/branches/release4.9: ./ frameworks/projects/apache/ mustella/tests/components/ mustella/tests/gumbo/components/TextInput/Properties/ mustella/tests/gumbo/components/TextInput/Properties/baselines/ mustella/... Date: Sat, 22 Dec 2012 06:35:04 -0000 To: flex-commits@incubator.apache.org From: aharui@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121222063504.D0B5823888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aharui Date: Sat Dec 22 06:35:04 2012 New Revision: 1425250 URL: http://svn.apache.org/viewvc?rev=1425250&view=rev Log: merge develop branch mustella test fixes to release4.9 branch (except mobile fixes). Rev #'s: 1424357 1424836 Modified: incubator/flex/sdk/branches/release4.9/ (props changed) incubator/flex/sdk/branches/release4.9/README (props changed) incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml (props changed) incubator/flex/sdk/branches/release4.9/mustella/tests/components/ (props changed) incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml Propchange: incubator/flex/sdk/branches/release4.9/ ------------------------------------------------------------------------------ Merged /incubator/flex/sdk/branches/develop:r1423769,1424357,1424836 Propchange: incubator/flex/sdk/branches/release4.9/README ------------------------------------------------------------------------------ Merged /incubator/flex/sdk/branches/develop/README:r1423769,1424357,1424836 Propchange: incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml ------------------------------------------------------------------------------ Merged /incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml:r1423769,1424357,1424836 Propchange: incubator/flex/sdk/branches/release4.9/mustella/tests/components/ ------------------------------------------------------------------------------ Merged /incubator/flex/sdk/branches/develop/mustella/tests/components:r1423769,1424357,1424836 Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml?rev=1425250&r1=1425249&r2=1425250&view=diff ============================================================================== --- incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml (original) +++ incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml Sat Dec 22 06:35:04 2012 @@ -1020,7 +1020,7 @@ - + Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png?rev=1425250&r1=1425249&r2=1425250&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml?rev=1425250&r1=1425249&r2=1425250&view=diff ============================================================================== --- incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml (original) +++ incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml Sat Dec 22 06:35:04 2012 @@ -32,6 +32,11 @@ { } + + private function fixToFixed(numberToFormat:uint, baseCompare:String):String { + var s:String = application.cf_inline.format(numberToFormat); + return (s.indexOf(".") > -1) ? baseCompare + "." : baseCompare; + } ]]> @@ -55,7 +60,7 @@ + valueExpression="value=fixToFixed(0.12345, 'USD0')"/> @@ -114,7 +119,7 @@ + valueExpression="value=fixToFixed(0.12345, 'RUR0')"/> @@ -137,7 +142,7 @@ + valueExpression="value=fixToFixed(0.12345, 'RUR0')"/> @@ -160,7 +165,7 @@ + valueExpression="value=fixToFixed(0.12345, 'RUR0')"/> @@ -182,7 +187,7 @@ + valueExpression="value=fixToFixed(0.12345, 'RUR0')"/> @@ -347,7 +352,7 @@ + valueExpression="value=fixToFixed(0.12345, '€0')"/> @@ -365,7 +370,7 @@ + valueExpression="value=fixToFixed(0.12345, 'USD0')"/> @@ -386,7 +391,7 @@ + valueExpression="value=fixToFixed(0.12345, 'CNY0')"/>