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/06/09 16:50:19 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - Fix issue with
multi select and ctrl clicking on start and or of date ranges.
Updated Branches:
refs/heads/develop f8ef963ae -> 93cb13180
Fix issue with multi select and ctrl clicking on start and or of date 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/1862046b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1862046b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1862046b
Branch: refs/heads/develop
Commit: 1862046bd0229219bb30072a543076aa4b2fccb1
Parents: 5f7cb1a
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jun 9 21:28:10 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sun Jun 9 21:28:10 2013 +1000
----------------------------------------------------------------------
frameworks/projects/mx/src/mx/controls/CalendarLayout.as | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1862046b/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 d7f18c4..a2db84c 100644
--- a/frameworks/projects/mx/src/mx/controls/CalendarLayout.as
+++ b/frameworks/projects/mx/src/mx/controls/CalendarLayout.as
@@ -2039,6 +2039,14 @@ public class CalendarLayout extends UIComponent
selectedRangeCount++;
}
+ // remove day at start of range
+ else if (endDate.time == rangeStart.time) {
+ _selectedRanges[n].rangeStart = addSubtractDays(startDate, +1);
+ }
+ // remove day at end of range
+ else if (startDate.time == rangeEnd.time) {
+ _selectedRanges[n].rangeEnd = addSubtractDays(endDate, -1);
+ }
// move selection start date if end overlaps
else if (endDate >= rangeStart)
{
[2/2] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by jm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/93cb1318
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/93cb1318
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/93cb1318
Branch: refs/heads/develop
Commit: 93cb1318027fc0e33ad0ad699c5f64d4084ed7ad
Parents: 1862046 f8ef963
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Jun 10 00:49:55 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Jun 10 00:49:55 2013 +1000
----------------------------------------------------------------------
mustella/as3/src/mustella/CompareBitmap.as | 1 +
mustella/jenkins.sh | 3 +-
.../AreaSeries_sameAxis_diffRenderers.png | Bin 15945 -> 16098 bytes
.../AreaSeries_sameAxis_diffRenderers.png.xml | 123 ++++++++++---------
.../Charts/Area/SWFs/MultipleAxesUtils.as | 2 +
.../Bubble/Properties/BubbleProperties.mxml | 2 +-
.../Properties/GVB_source_tester.mxml | 12 +-
7 files changed, 77 insertions(+), 66 deletions(-)
----------------------------------------------------------------------