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/05/07 11:04:02 UTC
[2/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-27652 Fixed
month getting stuck on September and fixed RTEs for open ended ranges
FLEX-27652 Fixed month getting stuck on September and fixed RTEs for open ended ranges
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/aa837d62
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/aa837d62
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/aa837d62
Branch: refs/heads/develop
Commit: aa837d625706d8b6dfcf5927e3195f12dc8469a8
Parents: 0d83571
Author: Justin Mclean <jm...@apache.org>
Authored: Tue May 7 19:03:43 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue May 7 19:03:43 2013 +1000
----------------------------------------------------------------------
.../projects/mx/src/mx/controls/DateChooser.as | 27 ++++++++++----
1 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa837d62/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 ed05856..289d10f 100644
--- a/frameworks/projects/mx/src/mx/controls/DateChooser.as
+++ b/frameworks/projects/mx/src/mx/controls/DateChooser.as
@@ -3083,9 +3083,12 @@ public class DateChooser extends UIComponent implements IFocusManagerComponent,
var longestMonthName:String = monthNames ? monthNames[longestMonth] : "";
var longestMonthText:String = longestMonthName + monthSymbol;
var longestMonthUITextField:IUITextField = monthDisplay;
+ var oldMonth:String = monthDisplay.text;
+
longestMonthUITextField.text = longestMonthText
monthDisplay.width = longestMonthWidth * longestMonthUITextField.getExplicitOrMeasuredWidth()
/ measureText(longestMonthText).width;
+ longestMonthUITextField.text = oldMonth;
}
/**
@@ -3214,10 +3217,12 @@ public class DateChooser extends UIComponent implements IFocusManagerComponent,
(dateGrid.selRangeMode == 1 || dateGrid.selRangeMode == 3))
{
var newDate:Object = CalendarLayout.getNewIncrementDate(displayedYear, displayedMonth, 1, 0);
- var testDate:Date = new Date(newDate.year, newDate.month,
+
+ if (selectableRange.rangeEnd != null)
+ var testDate:Date = new Date(newDate.year, newDate.month,
selectableRange.rangeEnd.getDate());
- if (selectableRange.rangeEnd >= testDate)
+ if (selectableRange.rangeEnd == null || selectableRange.rangeEnd >= testDate)
{
dateGrid.stepDate(1, 0, event);
invalidateDisplayList();
@@ -3244,10 +3249,12 @@ public class DateChooser extends UIComponent implements IFocusManagerComponent,
(dateGrid.selRangeMode == 1 || dateGrid.selRangeMode == 2))
{
var newDate:Object = CalendarLayout.getNewIncrementDate(displayedYear, displayedMonth, -1, 0);
- var testDate:Date = new Date(newDate.year, newDate.month,
+
+ if (selectableRange.rangeStart != null)
+ var testDate:Date = new Date(newDate.year, newDate.month,
selectableRange.rangeStart.getDate());
- if (selectableRange.rangeStart <= testDate)
+ if (selectableRange.rangeStart == null || selectableRange.rangeStart <= testDate)
{
dateGrid.stepDate(-1, 0, event);
invalidateDisplayList();
@@ -3274,10 +3281,12 @@ public class DateChooser extends UIComponent implements IFocusManagerComponent,
(dateGrid.selRangeMode == 1 || dateGrid.selRangeMode == 3))
{
var newDate:Object = CalendarLayout.getNewIncrementDate(displayedYear, displayedMonth, 0, 1);
- var testDate:Date = new Date(newDate.year, newDate.month,
+
+ if (selectableRange.rangeEnd != null)
+ var testDate:Date = new Date(newDate.year, newDate.month,
selectableRange.rangeEnd.getDate());
- if (selectableRange.rangeEnd >= testDate)
+ if (selectableRange.rangeEnd == null || selectableRange.rangeEnd >= testDate)
{
dateGrid.stepDate(0, 1, event);
invalidateDisplayList();
@@ -3304,10 +3313,12 @@ public class DateChooser extends UIComponent implements IFocusManagerComponent,
(dateGrid.selRangeMode == 1 || dateGrid.selRangeMode == 2))
{
var newDate:Object = CalendarLayout.getNewIncrementDate(displayedYear, displayedMonth, 0, -1);
- var testDate:Date = new Date(newDate.year, newDate.month,
+
+ if (selectableRange.rangeStart != null)
+ var testDate:Date = new Date(newDate.year, newDate.month,
selectableRange.rangeStart.getDate());
- if (selectableRange.rangeStart <= testDate)
+ if (selectableRange.rangeStart == null || selectableRange.rangeStart <= testDate)
{
dateGrid.stepDate(0, -1, event);
invalidateDisplayList();