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/10/16 01:39:00 UTC
[1/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - Minor
changes to README to reflect need for RSLs before running IDE batch files.
Updated Branches:
refs/heads/release4.11.0 77f4c997a -> c47ef1790
Minor changes to README to reflect need for RSLs before running IDE batch files.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e376a1e5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e376a1e5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e376a1e5
Branch: refs/heads/release4.11.0
Commit: e376a1e5d6df529794e11e4105638522778edcb5
Parents: d2ccdc1
Author: Nick Kwiatkowski <qu...@apache.org>
Authored: Mon Oct 14 12:00:51 2013 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Mon Oct 14 12:00:51 2013 -0400
----------------------------------------------------------------------
README | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e376a1e5/README
----------------------------------------------------------------------
diff --git a/README b/README
index eca4ce0..c704593 100644
--- a/README
+++ b/README
@@ -467,10 +467,16 @@ Using the Binary Distribution
You must download the third-party dependencies.
When you have all the prerequisites in place and the environment variables set,
- (see Install Prerequisites above), use
+ (see Install Prerequisites above -- you cannot use the env.properties file to set
+ the environment variables for these steps.), use
cd <flex.dir>/frameworks
ant thirdparty-downloads
+
+ Additionally, you will need to build the RSLS for the SDK before you run the batch files.
+
+ cd <flex.dir>
+ ant frameworks-rsls
To use this SDK in a IDE like Flash Builder 4.6 or 4.7 the SDK needs several other
files to be packaged and integrated with the Apache Flex SDK.
[6/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
branch 'release4.11.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk
into release4.11.0
Posted by jm...@apache.org.
Merge branch 'release4.11.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk into release4.11.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b65faff8
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b65faff8
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b65faff8
Branch: refs/heads/release4.11.0
Commit: b65faff81a4dbd14af55a1a91efa747825a660fd
Parents: 734c353 77f4c99
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Oct 16 09:42:35 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Oct 16 09:42:35 2013 +1100
----------------------------------------------------------------------
.../src/spark/skins/mobile/CheckBoxSkin.as | 4 +-
.../src/spark/skins/mobile/RadioButtonSkin.as | 46 ++++++++++++++++++++
.../skins/mobile480/assets/CheckBox_down.fxg | 12 ++---
.../mobile480/assets/CheckBox_downSymbol.fxg | 6 +--
.../assets/CheckBox_downSymbolSelected.fxg | 11 ++---
.../skins/mobile480/assets/CheckBox_up.fxg | 12 ++---
.../mobile480/assets/CheckBox_upSymbol.fxg | 6 +--
.../assets/CheckBox_upSymbolSelected.fxg | 9 +---
.../skins/mobile480/assets/RadioButton_down.fxg | 8 ++--
.../mobile480/assets/RadioButton_downSymbol.fxg | 4 +-
.../assets/RadioButton_downSymbolSelected.fxg | 4 +-
.../skins/mobile480/assets/RadioButton_up.fxg | 6 +--
.../mobile480/assets/RadioButton_upSymbol.fxg | 4 +-
.../assets/RadioButton_upSymbolSelected.fxg | 4 +-
.../skins/mobile640/assets/CheckBox_down.fxg | 14 +++---
.../mobile640/assets/CheckBox_downSymbol.fxg | 6 +--
.../assets/CheckBox_downSymbolSelected.fxg | 11 ++---
.../skins/mobile640/assets/CheckBox_up.fxg | 12 ++---
.../mobile640/assets/CheckBox_upSymbol.fxg | 6 +--
.../assets/CheckBox_upSymbolSelected.fxg | 9 +---
.../skins/mobile640/assets/RadioButton_down.fxg | 8 ++--
.../mobile640/assets/RadioButton_downSymbol.fxg | 4 +-
.../assets/RadioButton_downSymbolSelected.fxg | 4 +-
.../skins/mobile640/assets/RadioButton_up.fxg | 6 +--
.../mobile640/assets/RadioButton_upSymbol.fxg | 4 +-
.../assets/RadioButton_upSymbolSelected.fxg | 4 +-
26 files changed, 125 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
[4/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
commit '05cc8f3e9a0fe66d356a7474b02f26b063f687b3' into release4.11.0
Posted by jm...@apache.org.
Merge commit '05cc8f3e9a0fe66d356a7474b02f26b063f687b3' into release4.11.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/734c3531
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/734c3531
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/734c3531
Branch: refs/heads/release4.11.0
Commit: 734c3531c3ca3c327a728e88795c12091b763fbd
Parents: ed4190e 05cc8f3
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Oct 15 14:52:31 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Oct 15 14:52:31 2013 +1100
----------------------------------------------------------------------
README | 8 ++++++-
.../projects/spark/src/spark/components/Grid.as | 23 +++-----------------
2 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[3/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - REFIX
https://issues.apache.org/jira/browse/FLEX-33818 (Spark Datagrid column
resize and sort bug when releasing mouse outside of headers) [Mustella test
pass] - gumbo/components/DataGrid/Properti
Posted by jm...@apache.org.
REFIX https://issues.apache.org/jira/browse/FLEX-33818 (Spark Datagrid column resize and sort bug when releasing mouse outside of headers)
[Mustella test pass]
- gumbo/components/DataGrid/Properties
- gumbo/components/DataGrid/Styles
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/05cc8f3e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/05cc8f3e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/05cc8f3e
Branch: refs/heads/release4.11.0
Commit: 05cc8f3e9a0fe66d356a7474b02f26b063f687b3
Parents: fca2a38
Author: mamsellem <ma...@systar.com>
Authored: Tue Oct 15 00:39:29 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Tue Oct 15 00:39:29 2013 +0200
----------------------------------------------------------------------
.../projects/spark/src/spark/components/GridColumnHeaderGroup.as | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/05cc8f3e/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
index 51827f9..bd62162 100644
--- a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
+++ b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
@@ -1064,9 +1064,11 @@ public class GridColumnHeaderGroup extends Group implements IDataGridElement
{
const eventHeaderCP:CellPosition = new CellPosition();
const eventHeaderXY:Point = new Point();
- if (!eventToHeaderLocations(event, eventHeaderCP, eventHeaderXY))
+ // mouse can be released outside of header , so don't check cf. https://issues.apache.org/jira/browse/FLEX-33818
+ if (event.type != MouseEvent.MOUSE_UP && !eventToHeaderLocations(event, eventHeaderCP, eventHeaderXY))
return;
+
const eventSeparatorIndex:int = eventHeaderCP.rowIndex;
const eventColumnIndex:int = (eventSeparatorIndex == -1) ? eventHeaderCP.columnIndex : -1;
[7/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - FLEX-33823
fixed parsing of month strings in stringToDate
Posted by jm...@apache.org.
FLEX-33823 fixed parsing of month strings in stringToDate
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ba846c44
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ba846c44
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ba846c44
Branch: refs/heads/release4.11.0
Commit: ba846c4478d78f131387f9cc7561280c40ef963b
Parents: c556895
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Oct 16 09:50:03 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Oct 16 09:50:03 2013 +1100
----------------------------------------------------------------------
frameworks/projects/mx/src/mx/controls/DateField.as | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ba846c44/frameworks/projects/mx/src/mx/controls/DateField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DateField.as b/frameworks/projects/mx/src/mx/controls/DateField.as
index 6318633..6d45041 100644
--- a/frameworks/projects/mx/src/mx/controls/DateField.as
+++ b/frameworks/projects/mx/src/mx/controls/DateField.as
@@ -475,10 +475,19 @@ public class DateField extends ComboBase
if (valueString == null || inputFormat == null)
return null;
+ var monthNames:Array = ResourceManager.getInstance()
+ .getStringArray("SharedResources", "monthNames");
+
+ var noMonths:int = monthNames.length;
+ for (var i:int = 0; i < noMonths; i++) {
+ valueString = valueString.replace(monthNames[i], (i+1).toString());
+ valueString = valueString.replace(monthNames[i].substr(0,3), (i+1).toString());
+ }
+
length = valueString.length;
dateParts[part] = "";
- for (var i:int = 0; i < length; i++)
+ for (i = 0; i < length; i++)
{
dateChar = valueString.charAt(i);
[2/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - UNDO FIX
https://issues.apache.org/jira/browse/FLEX-33813 (DataGrid goes blank when
scrolled and dataProvider is changed ) UNDO Fix
https://issues.apache.org/jira/browse/FLEX-33818 (Spark Datagrid
Posted by jm...@apache.org.
UNDO FIX https://issues.apache.org/jira/browse/FLEX-33813 (DataGrid goes blank when scrolled and dataProvider is changed )
UNDO Fix https://issues.apache.org/jira/browse/FLEX-33818 (Spark Datagrid column resize and sort bug when releasing mouse outside of headers)
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fca2a381
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fca2a381
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fca2a381
Branch: refs/heads/release4.11.0
Commit: fca2a38124a2f93bdf8868b008b845553919279c
Parents: e376a1e
Author: mamsellem <ma...@systar.com>
Authored: Mon Oct 14 22:21:17 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Mon Oct 14 22:21:17 2013 +0200
----------------------------------------------------------------------
.../projects/spark/src/spark/components/Grid.as | 23 +++-----------------
.../spark/components/GridColumnHeaderGroup.as | 4 +---
2 files changed, 4 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fca2a381/frameworks/projects/spark/src/spark/components/Grid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Grid.as b/frameworks/projects/spark/src/spark/components/Grid.as
index 847fa1d..9dcfbd3 100644
--- a/frameworks/projects/spark/src/spark/components/Grid.as
+++ b/frameworks/projects/spark/src/spark/components/Grid.as
@@ -269,9 +269,7 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
* rowIndex of the caret after a collection refresh event.
*/
private var caretSelectedItem:Object = null;
- private var updateCaretForDataProviderChanged:Boolean = false;
- private var updateCaretForDataProviderChangeLastEvent:CollectionEvent;
-
+
/**
* @private
* True while updateDisplayList is running. Use to disable invalidateSize(),
@@ -4602,13 +4600,8 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
if (!variableRowHeight)
setFixedRowHeight(gridDimensions.getRowHeight(0));
- if (updateCaretForDataProviderChanged){
- updateCaretForDataProviderChanged = false;
- updateCaretForDataProviderChange(updateCaretForDataProviderChangeLastEvent);
- updateCaretForDataProviderChangeLastEvent = null;
}
- }
-
+
//--------------------------------------------------------------------------
//
// Methods
@@ -5626,19 +5619,9 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
invalidateSize();
invalidateDisplayList();
- if (caretRowIndex != -1) {
- if (event.kind == CollectionEventKind.RESET){
- // defer for reset events
- updateCaretForDataProviderChanged = true;
- updateCaretForDataProviderChangeLastEvent = event;
- invalidateDisplayList();
- }
- else {
+ if (caretRowIndex != -1)
updateCaretForDataProviderChange(event);
- }
- }
-
// Trigger bindings to selectedIndex/selectedCell/selectedItem and the plurals of those.
if (selectionChanged)
dispatchFlexEvent(FlexEvent.VALUE_COMMIT);
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fca2a381/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
index bd62162..51827f9 100644
--- a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
+++ b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
@@ -1064,11 +1064,9 @@ public class GridColumnHeaderGroup extends Group implements IDataGridElement
{
const eventHeaderCP:CellPosition = new CellPosition();
const eventHeaderXY:Point = new Point();
- // mouse can be released outside of header , so don't check cf. https://issues.apache.org/jira/browse/FLEX-33818
- if (event.type != MouseEvent.MOUSE_UP && !eventToHeaderLocations(event, eventHeaderCP, eventHeaderXY))
+ if (!eventToHeaderLocations(event, eventHeaderCP, eventHeaderXY))
return;
-
const eventSeparatorIndex:int = eventHeaderCP.rowIndex;
const eventColumnIndex:int = (eventSeparatorIndex == -1) ? eventHeaderCP.columnIndex : -1;
[8/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
commit 'ba846c4478d78f131387f9cc7561280c40ef963b' into release4.11.0
Posted by jm...@apache.org.
Merge commit 'ba846c4478d78f131387f9cc7561280c40ef963b' into release4.11.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c47ef179
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c47ef179
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c47ef179
Branch: refs/heads/release4.11.0
Commit: c47ef17906b37712b451129e3d80f2b4cf59e322
Parents: b65faff ba846c4
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Oct 16 10:36:08 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Oct 16 10:36:08 2013 +1100
----------------------------------------------------------------------
.../projects/mx/src/mx/controls/DateField.as | 11 +++++++-
.../projects/spark/src/spark/components/Grid.as | 28 +++++++++++++++++---
.../DataGrid_requireSelection_test001.mxml | 2 +-
3 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[5/8] git commit: [flex-sdk] [refs/heads/release4.11.0] - REFIX
FLEX-33813 (DataGrid goes blank when scrolled and dataProvider is changed
Posted by jm...@apache.org.
REFIX FLEX-33813 (DataGrid goes blank when scrolled and dataProvider is changed
[Mustella test pass]
- gumbo/components/DataGrid/Properties
- gumbo/components/DataGrid/Styles
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c556895e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c556895e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c556895e
Branch: refs/heads/release4.11.0
Commit: c556895ee94e39eddc6095c49f47caa4935767c5
Parents: 05cc8f3
Author: mamsellem <ma...@systar.com>
Authored: Tue Oct 15 22:38:31 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Tue Oct 15 22:38:31 2013 +0200
----------------------------------------------------------------------
.../projects/spark/src/spark/components/Grid.as | 28 +++++++++++++++++---
.../DataGrid_requireSelection_test001.mxml | 2 +-
2 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c556895e/frameworks/projects/spark/src/spark/components/Grid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Grid.as b/frameworks/projects/spark/src/spark/components/Grid.as
index 9dcfbd3..eed7d09 100644
--- a/frameworks/projects/spark/src/spark/components/Grid.as
+++ b/frameworks/projects/spark/src/spark/components/Grid.as
@@ -269,7 +269,9 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
* rowIndex of the caret after a collection refresh event.
*/
private var caretSelectedItem:Object = null;
-
+ private var updateCaretForDataProviderChanged:Boolean = false;
+ private var updateCaretForDataProviderChangeLastEvent:CollectionEvent;
+
/**
* @private
* True while updateDisplayList is running. Use to disable invalidateSize(),
@@ -4584,6 +4586,13 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
caretChanged = false;
}
+
+ if (updateCaretForDataProviderChanged)
+ {
+ updateCaretForDataProviderChanged = false;
+ updateCaretForDataProviderChange(updateCaretForDataProviderChangeLastEvent);
+ updateCaretForDataProviderChangeLastEvent = null;
+ }
}
@@ -4600,8 +4609,9 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
if (!variableRowHeight)
setFixedRowHeight(gridDimensions.getRowHeight(0));
- }
+ }
+
//--------------------------------------------------------------------------
//
// Methods
@@ -5033,7 +5043,7 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
// default max time between clicks for a double click is 480ms.
mx_internal var DOUBLE_CLICK_TIME:Number = 480;
-
+
/**
* @private
* Return the GridView whose bounds contain the MouseEvent, or null. Note that the
@@ -5619,9 +5629,19 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
invalidateSize();
invalidateDisplayList();
- if (caretRowIndex != -1)
+ if (caretRowIndex != -1) {
+ if (event.kind == CollectionEventKind.RESET){
+ // defer for reset events
+ updateCaretForDataProviderChanged = true;
+ updateCaretForDataProviderChangeLastEvent = event;
+ invalidateProperties();
+ }
+ else {
updateCaretForDataProviderChange(event);
+ }
+ }
+
// Trigger bindings to selectedIndex/selectedCell/selectedItem and the plurals of those.
if (selectionChanged)
dispatchFlexEvent(FlexEvent.VALUE_COMMIT);
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c556895e/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_requireSelection_test001.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_requireSelection_test001.mxml b/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_requireSelection_test001.mxml
index c089237..032e7d5 100644
--- a/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_requireSelection_test001.mxml
+++ b/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_requireSelection_test001.mxml
@@ -420,7 +420,7 @@
<body>
<RunCode code="FlexGlobals.topLevelApplication.dataGrid.selectionMode=GridSelectionMode.MULTIPLE_CELLS"/>
<AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid.selectionContainsCell(0,0)" value="true"/>
- <RunCode code="FlexGlobals.topLevelApplication.dataGrid.resetDP()" waitEvent="enterFrame" waitTarget="stage"/>
+ <RunCode code="FlexGlobals.topLevelApplication.dataGrid.resetDP2()" waitEvent="updateComplete" waitTarget="dataGrid.grid" />
<AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid.selectionContainsCell(0,0)" value="true"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
<CompareBitmap numColorVariances="20" maxColorVariance="20" url="../Properties/Baselines/$testID_cell.png" target="dataGrid"/>