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/29 11:01:38 UTC

git commit: [flex-sdk] - FLEX-14581 Stop null being displayed if month name not set

Updated Branches:
  refs/heads/develop a5e7e1525 -> b0533b606


FLEX-14581 Stop null being displayed if month name not set


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

Branch: refs/heads/develop
Commit: b0533b6064307564343baf894b7395a56f2a9ad8
Parents: a5e7e15
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Apr 29 19:00:47 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Apr 29 19:00:47 2013 +1000

----------------------------------------------------------------------
 .../projects/mx/src/mx/controls/DateChooser.as     |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b0533b60/frameworks/projects/mx/src/mx/controls/DateChooser.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DateChooser.as b/frameworks/projects/mx/src/mx/controls/DateChooser.as
index 1c887bc..27fe888 100644
--- a/frameworks/projects/mx/src/mx/controls/DateChooser.as
+++ b/frameworks/projects/mx/src/mx/controls/DateChooser.as
@@ -2986,6 +2986,9 @@ public class DateChooser extends UIComponent implements IFocusManagerComponent,
         var monthName:String = monthNames ?
                                monthNames[dateGrid.displayedMonth] :
                                "";
+		// month name could be null and want to display "null"
+		if (monthName == null)
+			monthName = "";
         monthDisplay.text = monthName + monthSymbol;
         yearDisplay.text = displayedYear.toString() + yearSymbol;
     }