FLEX-34133 Fix logic/ADG RTE in columnHeaderWordWrap
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cd234205 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cd234205 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cd234205 Branch: refs/heads/master Commit: cd23420530383dddc0d02dbaa427979be8db1b06 Parents: 537ec24 Author: Justin Mclean <jmcl...@apache.org> Authored: Thu Mar 20 10:43:52 2014 +1100 Committer: Justin Mclean <jmcl...@apache.org> Committed: Thu Mar 20 10:43:52 2014 +1100 ---------------------------------------------------------------------- .../AdvancedDataGridBase.as | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cd234205/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as index 5e4f33b..4a1b6d2 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as @@ -1693,12 +1693,15 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte */ mx_internal function columnHeaderWordWrap(c:AdvancedDataGridColumn):Boolean { - if (c.headerWordWrap == true) - return true; - if (c.headerWordWrap == false) - return false; - - return headerWordWrap; + if (c) + { + if (c.headerWordWrap === undefined) + return headerWordWrap; + else + return c.headerWordWrap; + } + + return headerWordWrap; } /** @@ -1711,10 +1714,13 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte */ mx_internal function columnWordWrap(c:AdvancedDataGridColumn):Boolean { - if (c.wordWrap == true) - return true; - if (c.wordWrap == false) - return false; + if (c) + { + if (c.wordWrap === undefined) + return wordWrap; + else + return c.wordWrap; + } return wordWrap; }
