Revert "Fix for issue FLEX-34320" This reverts commit 798194db5eaf9aa28db4fd6027f78b40bb15800d.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/71e817a1 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/71e817a1 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/71e817a1 Branch: refs/heads/master Commit: 71e817a1dae9fbae1ccb84f44a3be4b0beb5c693 Parents: 4199d43 Author: Om <[email protected]> Authored: Mon Jun 16 10:45:51 2014 -0700 Committer: Om <[email protected]> Committed: Mon Jun 16 10:45:51 2014 -0700 ---------------------------------------------------------------------- .../framework/src/mx/collections/Sort.as | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/71e817a1/frameworks/projects/framework/src/mx/collections/Sort.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/collections/Sort.as b/frameworks/projects/framework/src/mx/collections/Sort.as index 609d1ea..a1c7333 100644 --- a/frameworks/projects/framework/src/mx/collections/Sort.as +++ b/frameworks/projects/framework/src/mx/collections/Sort.as @@ -392,27 +392,23 @@ public class Sort extends EventDispatcher implements ISort { compareForFind = this.compareFunction; // configure the search criteria - if (values && fields.length > 0) + if (values && fieldList.length > 0) { fieldsForCompare = []; //build up the fields we can compare, if we skip a field in the //middle throw an error. it is ok to not have all the fields //though - var field:ISortField; + var fieldName:String; var hadPreviousFieldName:Boolean = true; - for (var i:int = 0; i < fields.length; i++) + for (var i:int = 0; i < fieldList.length; i++) { - field = fields[i]; - if (field) + fieldName = fieldList[i]; + if (fieldName) { var hasFieldName:Boolean = false; try { - hasFieldName = field.compareFunction != null; - - if ( !hasFieldName ) { - hasFieldName = values[field.name] !== undefined; - } + hasFieldName = values[fieldName] !== undefined; } catch(e:Error) { @@ -422,12 +418,12 @@ public class Sort extends EventDispatcher implements ISort if (!hadPreviousFieldName) { message = resourceManager.getString( - "collections", "findCondition", [ field.name ]); + "collections", "findCondition", [ fieldName ]); throw new SortError(message); } else { - fieldsForCompare.push(field); + fieldsForCompare.push(fieldName); } } else
