You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by mi...@apache.org on 2015/05/20 17:55:14 UTC
git commit: [flex-sdk] [refs/heads/develop] - FLEX-34850 Making the
column sorting identical, whether or not the dataField is complex.
Repository: flex-sdk
Updated Branches:
refs/heads/develop 357e2168e -> 4464b32d6
FLEX-34850
Making the column sorting identical, whether or not the dataField is complex.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4464b32d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4464b32d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4464b32d
Branch: refs/heads/develop
Commit: 4464b32d6eb3496d26e8e98ce84eaf5670980c21
Parents: 357e216
Author: Mihai Chira <mi...@apache.org>
Authored: Wed May 20 17:54:48 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Wed May 20 17:54:48 2015 +0200
----------------------------------------------------------------------
.../spark/components/gridClasses/GridColumn.as | 43 ++++++++------------
1 file changed, 17 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4464b32d/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
index 5c3236f..7c5036d 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
@@ -19,25 +19,22 @@
package spark.components.gridClasses
{
-import flash.events.Event;
-import flash.events.EventDispatcher;
+ import flash.events.Event;
+ import flash.events.EventDispatcher;
-import mx.core.ClassFactory;
-import mx.core.IFactory;
-import mx.core.mx_internal;
-import mx.events.CollectionEvent;
-import mx.events.CollectionEventKind;
-import mx.events.PropertyChangeEvent;
-import mx.formatters.IFormatter;
-import mx.styles.IAdvancedStyleClient;
-import mx.utils.ObjectUtil;
+ import mx.core.ClassFactory;
+ import mx.core.IFactory;
+ import mx.events.CollectionEvent;
+ import mx.events.CollectionEventKind;
+ import mx.events.PropertyChangeEvent;
+ import mx.formatters.IFormatter;
+ import mx.styles.IAdvancedStyleClient;
+ import mx.utils.ObjectUtil;
-import spark.collections.SortField;
-import spark.components.Grid;
-import spark.components.gridClasses.DefaultGridItemEditor;
-import spark.components.gridClasses.GridSortField;
+ import spark.collections.SortField;
+ import spark.components.Grid;
-use namespace mx_internal;
+ use namespace mx_internal;
/**
* The GridColumn class defines a column of a Spark grid control,
@@ -160,13 +157,7 @@ public class GridColumn extends EventDispatcher
const obj1String:String = column.itemToString(obj1, dataFieldPath, null, formatter);
const obj2String:String = column.itemToString(obj2, dataFieldPath, null, formatter);
- if ( obj1String < obj2String )
- return -1;
-
- if ( obj1String > obj2String )
- return 1;
-
- return 0;
+ return ObjectUtil.stringCompare(obj1String, obj2String);
}
//--------------------------------------------------------------------------
@@ -1856,10 +1847,10 @@ public class GridColumn extends EventDispatcher
/**
* @private
*/
- private function dispatchChangeEvent(type:String):void
+ private function dispatchChangeEvent(eventType:String):void
{
- if (hasEventListener(type))
- dispatchEvent(new Event(type));
+ if (hasEventListener(eventType))
+ dispatchEvent(new Event(eventType));
}
/**