Merge branch 'develop' into release4.16.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/13183954 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/13183954 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/13183954 Branch: refs/heads/release4.16.0 Commit: 13183954ec08c2c58d5e16b0067e352f0084e768 Parents: b7ea704 286a0ca Author: Mihai Chira <[email protected]> Authored: Wed Nov 9 14:24:15 2016 +0100 Committer: Mihai Chira <[email protected]> Committed: Wed Nov 9 14:24:15 2016 +0100 ---------------------------------------------------------------------- .../src/mx/collections/GroupingCollection.as | 2 +- .../src/mx/collections/GroupingCollection2.as | 2 +- .../src/mx/olap/DefaultCubeImpl.as | 6 ++-- .../src/spark/components/MobileGrid.as | 5 ++-- .../supportClasses/MobileGridColumn.as | 6 ++-- .../framework/src/mx/collections/ISortField.as | 31 +++++++++++++++++++- .../framework/src/mx/collections/SortField.as | 16 +++++----- .../framework/tests/FLEX_34852_Tests.as | 5 ++-- .../ListCollectionView_FLEX_34837_Tests.as | 4 +-- .../projects/mx/src/mx/controls/DataGrid.as | 15 ++++++---- .../spark/src/spark/collections/SortField.as | 9 +++--- .../spark/src/spark/components/DataGrid.as | 3 +- .../spark/components/gridClasses/GridColumn.as | 6 ++-- .../SWFs/GridSortPreserveSelection.mxml | 5 ++-- .../Sort/SWFs/SF_ORIG_DataGridApp.mxml | 10 +++---- .../Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml | 8 ++--- .../CustComp_sortField_compareFunction.mxml | 5 ++-- 17 files changed, 84 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
