You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/09/12 03:08:14 UTC

git commit: [flex-sdk] [refs/heads/develop] - FLEX-33726 Added support for dates with no separators such as YYYYMMDD or MMDDYYYY

Updated Branches:
  refs/heads/develop 9fe43d709 -> 3b4103741


FLEX-33726 Added support for dates with no separators such as YYYYMMDD or MMDDYYYY


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3b410374
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3b410374
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3b410374

Branch: refs/heads/develop
Commit: 3b41037414d8586bc7088a9e15ac688c2ada9d03
Parents: 9fe43d7
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Sep 12 10:26:59 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Sep 12 10:26:59 2013 +1000

----------------------------------------------------------------------
 .../projects/mx/src/mx/controls/DateField.as    | 26 +++++++++++++++++---
 .../DateField/Methods/DateField_Formats.mxml    |  3 +--
 2 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3b410374/frameworks/projects/mx/src/mx/controls/DateField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DateField.as b/frameworks/projects/mx/src/mx/controls/DateField.as
index bc43d6b..edbd472 100644
--- a/frameworks/projects/mx/src/mx/controls/DateField.as
+++ b/frameworks/projects/mx/src/mx/controls/DateField.as
@@ -470,6 +470,7 @@ public class DateField extends ComboBase
 		var maskParts:Array = [];
         var part:int = 0;
 		var length:int;
+		var position:int = 0;
 		
 		if (valueString == null || inputFormat == null)
 			return null;
@@ -519,8 +520,27 @@ public class DateField extends ComboBase
 			
 			lastChar = maskChar;
 		}
-		
+			
 		length = maskParts.length;
+
+		if (dateParts.length != length)
+		{
+			if (valueString.length != inputFormat.length) {
+				return null;
+			}
+			
+			for (i = 0; i < length; i++) {
+				dateParts[i] = valueString.substr(position, maskParts[i].length);
+				position += maskParts[i].length;
+			}
+			
+		}
+		
+		if (dateParts.length != length)
+		{
+			return null;
+		}
+
 		for (i = 0; i < length; i++) {
 			maskChar = maskParts[i].charAt(0);
 			
@@ -535,10 +555,8 @@ public class DateField extends ComboBase
 			}
 		}
 		
-		if (dateParts.length != maskParts.length)
-		{
+		if (dateString == null || monthString == null || yearString == null)
 			return null;
-		}
 		
 		var dayNum:Number = Number(dateString);
         var monthNum:Number = Number(monthString);

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3b410374/mustella/tests/components/DateField/Methods/DateField_Formats.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/DateField/Methods/DateField_Formats.mxml b/mustella/tests/components/DateField/Methods/DateField_Formats.mxml
index af758d0..157ad7b 100644
--- a/mustella/tests/components/DateField/Methods/DateField_Formats.mxml
+++ b/mustella/tests/components/DateField/Methods/DateField_Formats.mxml
@@ -243,7 +243,6 @@
 			return date;
 		} 
 		
-		//TODO support this
 		public function changeStringToNoSeperators():Date
 		{
 			var date:Date = DateField.stringToDate("19042013", "DDMMYYYY");
@@ -578,7 +577,7 @@
 				<SetProperty target="df" propertyName="selectedDate" valueExpression="value=new Date(2001, 1, 1)" waitEvent="updateComplete" waitTarget="df"/>				
 			</setup>
 			<body> 
-				<AssertMethodValue target="df" method="value=changeStringToNoSeperators()" valueExpression="value=null"/>
+				<AssertMethodValue target="df" method="value=changeStringToNoSeperators()" valueExpression="value=new Date(2013, 3, 19)"/>
 			</body>
 		</TestCase>
 		<TestCase testID="DateField_Format_No_Seperators_Single_Digit" keywords="[stringToDate, DateChooser]">