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/04/23 09:21:34 UTC
[1/2] git commit: [flex-sdk] - Fixed issue with AM/PM coming after
milliseconds
Updated Branches:
refs/heads/develop 715f587be -> 8c34d2e0a
Fixed issue with AM/PM coming after milliseconds
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/adc90f81
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/adc90f81
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/adc90f81
Branch: refs/heads/develop
Commit: adc90f812a042d84f2721d701908e8928dc3a7bc
Parents: 715f587
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Apr 23 16:49:00 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Apr 23 16:49:00 2013 +1000
----------------------------------------------------------------------
.../framework/src/mx/formatters/DateFormatter.as | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/adc90f81/frameworks/projects/framework/src/mx/formatters/DateFormatter.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/formatters/DateFormatter.as b/frameworks/projects/framework/src/mx/formatters/DateFormatter.as
index 652e80a..d3c585f 100644
--- a/frameworks/projects/framework/src/mx/formatters/DateFormatter.as
+++ b/frameworks/projects/framework/src/mx/formatters/DateFormatter.as
@@ -285,11 +285,13 @@ public class DateFormatter extends Formatter
day = num;
else if (sec < 0)
sec = num;
+ else if (milli < 0)
+ milli = num;
else
break; //error
}
- // If the current letter is a colon,
+ // If the current letter is a colon or a dot,
// assign num to hour or minute or sec.
else if (punctuation.hasOwnProperty(letter) && punctuation[letter].time)
{
@@ -299,6 +301,8 @@ public class DateFormatter extends Formatter
min = num;
else if (sec < 0)
sec = num;
+ else if (milli < 0)
+ milli = num;
else
break; //error
}
[2/2] git commit: [flex-sdk] - Minor update to template - needs more
love
Posted by jm...@apache.org.
Minor update to template - needs more love
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8c34d2e0
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8c34d2e0
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8c34d2e0
Branch: refs/heads/develop
Commit: 8c34d2e0a3e250db55e48e8cf736dc1dddf085b4
Parents: adc90f8
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Apr 23 17:21:17 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Apr 23 17:21:17 2013 +1000
----------------------------------------------------------------------
templates/swfobject/index.template.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8c34d2e0/templates/swfobject/index.template.html
----------------------------------------------------------------------
diff --git a/templates/swfobject/index.template.html b/templates/swfobject/index.template.html
index 602b25b..665486b 100644
--- a/templates/swfobject/index.template.html
+++ b/templates/swfobject/index.template.html
@@ -22,9 +22,9 @@
This application was built using Apache Flex, an open source framework
for building rich Internet applications that get delivered via the
- Flash Player or to desktops via Adobe AIR.
+ Flash Player or to desktops and mobile phones via Adobe AIR.
- Learn more about Flex at http://flex.org
+ Learn more about Flex at http://flex.apache.org
// -->
<head>
<title>${title}</title>