Updated Branches: refs/heads/develop dc9f5c67f -> 52d831085
Revert "Fixed issue with data grid using an array of strings creating a column called length" This reverts commit c6b5dc7a44a9f1b9d650023cd1774305de0b3bd7. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/18588f08 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/18588f08 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/18588f08 Branch: refs/heads/develop Commit: 18588f0829b2377d2d08385f9a21ecbc7fbf90fd Parents: dc9f5c6 Author: Justin Mclean <jmcl...@apache.org> Authored: Thu Aug 15 07:41:50 2013 +1000 Committer: Justin Mclean <jmcl...@apache.org> Committed: Thu Aug 15 07:41:50 2013 +1000 ---------------------------------------------------------------------- frameworks/projects/mx/src/mx/controls/DataGrid.as | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/18588f08/frameworks/projects/mx/src/mx/controls/DataGrid.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/controls/DataGrid.as b/frameworks/projects/mx/src/mx/controls/DataGrid.as index 087ef90..30f20e7 100644 --- a/frameworks/projects/mx/src/mx/controls/DataGrid.as +++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as @@ -2770,13 +2770,9 @@ public class DataGrid extends DataGridBase implements IIMESupport iteratorValid = false; return; } - - var excludes:Array = ["uid", "mx_internal_uid"]; - if (iterator && iterator.current is String) - excludes.push("length"); - var info:Object = - ObjectUtil.getClassInfo(iterator.current, excludes); + ObjectUtil.getClassInfo(iterator.current, + ["uid", "mx_internal_uid"]); if (info) cols = info.properties; @@ -2801,7 +2797,7 @@ public class DataGrid extends DataGridBase implements IIMESupport // this is an old recordset - use its columns var n:int = cols.length; var colName:Object; - if (n == 0 && iterator.current) { + if (n == 0) { col = new DataGridColumn(); newCols.push(col); }
