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/09 07:57:00 UTC
[3/5] git commit: [flex-sdk] [refs/heads/develop] - FLEX-13423 Date
ranges are currently used inconstantly - simpler and easier to understand if
endDate and startDates are included
FLEX-13423 Date ranges are currently used inconstantly - simpler and easier to understand if endDate and startDates are included
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8326e93f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8326e93f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8326e93f
Branch: refs/heads/develop
Commit: 8326e93f0e982c9353e0efffe2474d4e2e0519b8
Parents: 9cd9553
Author: Justin Mclean <jm...@apache.org>
Authored: Thu May 9 12:17:07 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu May 9 12:17:07 2013 +1000
----------------------------------------------------------------------
.../projects/mx/src/mx/controls/CalendarLayout.as | 21 +++++++--------
1 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8326e93f/frameworks/projects/mx/src/mx/controls/CalendarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/CalendarLayout.as b/frameworks/projects/mx/src/mx/controls/CalendarLayout.as
index 04676e4..95a9586 100644
--- a/frameworks/projects/mx/src/mx/controls/CalendarLayout.as
+++ b/frameworks/projects/mx/src/mx/controls/CalendarLayout.as
@@ -2020,7 +2020,7 @@ public class CalendarLayout extends UIComponent
{
if (endDate < rangeEnd)
{
- _selectedRanges[n].rangeStart = addSubtractDays(endDate, 1);
+ _selectedRanges[n].rangeStart = endDate;
}
else
{
@@ -2036,18 +2036,17 @@ public class CalendarLayout extends UIComponent
{
var temp:Date = _selectedRanges[n].rangeEnd;
- _selectedRanges[n].rangeEnd = addSubtractDays(startDate, -1);
+ _selectedRanges[n].rangeEnd = startDate;
_selectedRanges[selectedRangeCount] = {};
- _selectedRanges[selectedRangeCount].rangeStart =
- addSubtractDays(endDate, 1);
+ _selectedRanges[selectedRangeCount].rangeStart = endDate;
_selectedRanges[selectedRangeCount].rangeEnd = temp;
selectedRangeCount += 1;
}
else
{
- _selectedRanges[n].rangeEnd = addSubtractDays(startDate, -1);
+ _selectedRanges[n].rangeEnd = startDate;
}
}
}
@@ -2450,12 +2449,12 @@ public class CalendarLayout extends UIComponent
{
if (alreadySelected)
{
- removeSelectionIndicator(colIndex,rowIndex);
- removeRangeFromSelection(newDate,newDate);
+ removeSelectionIndicator(colIndex, rowIndex);
+ removeRangeFromSelection(newDate, newDate);
}
else
{
- addSelectionIndicator(colIndex,rowIndex);
+ addSelectionIndicator(colIndex, rowIndex);
addToSelected(newDate);
}
}
@@ -2474,14 +2473,14 @@ public class CalendarLayout extends UIComponent
}
else if (event.ctrlKey)
{
- removeSelectionIndicator(colIndex,rowIndex);
- removeRangeFromSelection(newDate,newDate);
+ removeSelectionIndicator(colIndex, rowIndex);
+ removeRangeFromSelection(newDate, newDate);
}
}
else
{
selectedRangeCount = 0;
- addSelectionIndicator(colIndex,rowIndex);
+ addSelectionIndicator(colIndex, rowIndex);
addToSelected(newDate);
setSelectedIndicators();
}