FLEX-34132 further improvements.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c9d67583 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c9d67583 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c9d67583 Branch: refs/heads/master Commit: c9d675836c52ea042df375e07f622c5c6aed8656 Parents: 2b2cc0c Author: Justin Mclean <jmcl...@apache.org> Authored: Thu Mar 20 09:46:20 2014 +1100 Committer: Justin Mclean <jmcl...@apache.org> Committed: Thu Mar 20 09:46:20 2014 +1100 ---------------------------------------------------------------------- .../advancedDataGridClasses/AdvancedDataGridColumn.as | 11 ++++------- .../AdvancedDataGridColumnGroup.as | 2 +- .../mx/src/mx/controls/dataGridClasses/DataGridColumn.as | 11 ++++++----- 3 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c9d67583/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 36801b3..5d4c7cc 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as @@ -1778,13 +1778,10 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES if (typeof(data) == "object" || typeof(data) == "xml") { - if (dataField != null) - { - if (dataField in data) - data = data[dataField]; - else - return " "; // stops "[object Object]" showing - } + if (dataField != null && dataField in data) + data = data[dataField]; + else + return " "; // stops "[object Object]" showing } if (data is String) http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c9d67583/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as index 98efd76..cfd692c 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as @@ -266,7 +266,7 @@ public class AdvancedDataGridColumnGroup extends AdvancedDataGridColumn { if (dataField != null) { - if (dataField in data) + if (dataField != null && dataField in data) data = data[dataField]; else data = null; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c9d67583/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as index 8a4a209..6ed783a 100644 --- a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as +++ b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as @@ -1743,12 +1743,13 @@ public class DataGridColumn extends CSSStyleDeclaration implements IIMESupport { data = deriveComplexColumnData(data); } - else if (dataField != null) + else if (dataField != null && dataField in data) { - if (dataField in data) - data = data[dataField]; - else - data = null; + data = data[dataField]; + } + else + { + data = null; } }
