Updated Branches: refs/heads/develop c85073c1e -> 64c0f1afb
FLEX-33702: Added sortCompareType to AdvancedDataGrid and corrected some spelling. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/64c0f1af Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/64c0f1af Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/64c0f1af Branch: refs/heads/develop Commit: 64c0f1afb9fddcca8c60144d271913ab22bb1ea0 Parents: c85073c Author: Mark Kessler <kesslerconsult...@gmail.com> Authored: Fri Sep 13 20:30:22 2013 -0400 Committer: Mark Kessler <kesslerconsult...@gmail.com> Committed: Fri Sep 13 21:02:24 2013 -0400 ---------------------------------------------------------------------- .../src/mx/controls/AdvancedDataGridBaseEx.as | 1 + .../AdvancedDataGridColumn.as | 37 ++++++++++++++++++++ .../framework/src/mx/collections/SortField.as | 2 +- .../spark/src/spark/collections/SortField.as | 2 +- 4 files changed, 40 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64c0f1af/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as index e1f4766..0dc81d8 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as @@ -6130,6 +6130,7 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME column.sortDescending = desc; var field:ISortField = new SortField(columnName); // name + field.sortCompareType = column.sortCompareType; field.descending = desc; // field.name = column.dataField; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64c0f1af/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as index d015779..034bb51 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as @@ -1284,6 +1284,43 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES dispatchEvent(new Event("sortCompareFunctionChanged")); } + + //---------------------------------- + // sortCompareType + //---------------------------------- + + /** + * @private + */ + private var _sortCompareType:String; + + /** + * @inheritDoc + * + * @langversion 3.0 + * @playerversion Flash 11.8 + * @playerversion AIR 3.8 + * @productversion Flex 4.11 + */ + [Bindable("sortCompareTypeChanged")] + public function get sortCompareType():String + { + return _sortCompareType; + } + + /** + * @private + */ + public function set sortCompareType(value:String):void + { + if (_sortCompareType != value) + { + _sortCompareType = value; + dispatchEvent(new Event("sortCompareTypeChanged")); + } + } + + //---------------------------------- // visible //---------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64c0f1af/frameworks/projects/framework/src/mx/collections/SortField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/collections/SortField.as b/frameworks/projects/framework/src/mx/collections/SortField.as index 3a5a388..53b2dab 100644 --- a/frameworks/projects/framework/src/mx/collections/SortField.as +++ b/frameworks/projects/framework/src/mx/collections/SortField.as @@ -607,7 +607,7 @@ public class SortField extends EventDispatcher implements ISortField } - //Loopup the sortCompareType by its SortFieldCompareTypes and set the assocuated compare function. + //Lookup the sortCompareType by its SortFieldCompareTypes value and set the associated compare method. switch(_sortCompareType) { case SortFieldCompareTypes.DATE: http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64c0f1af/frameworks/projects/spark/src/spark/collections/SortField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/collections/SortField.as b/frameworks/projects/spark/src/spark/collections/SortField.as index cdb81a2..38d81e6 100644 --- a/frameworks/projects/spark/src/spark/collections/SortField.as +++ b/frameworks/projects/spark/src/spark/collections/SortField.as @@ -703,7 +703,7 @@ public class SortField extends AdvancedStyleClient implements ISortField } - //Loopup the sortCompareType by its SortFieldCompareTypes and set the assocuated compare function. + //Lookup the sortCompareType by its SortFieldCompareTypes value and set the associated compare method. switch(_sortCompareType) { case SortFieldCompareTypes.DATE:
