Updated Branches: refs/heads/develop 549384b2d -> 009eb4e8a
FLEX-34051 fix for RTE Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cde9a4b5 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cde9a4b5 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cde9a4b5 Branch: refs/heads/develop Commit: cde9a4b5fefa605dc5a9fa87b1ed9ffc8e3812df Parents: a2bb8c2 Author: Justin Mclean <[email protected]> Authored: Mon Jan 20 18:52:42 2014 +1100 Committer: Justin Mclean <[email protected]> Committed: Mon Jan 20 18:52:42 2014 +1100 ---------------------------------------------------------------------- .../src/mx/controls/AdvancedDataGridBaseEx.as | 32 +++++++++++--------- .../projects/mx/src/mx/controls/DataGrid.as | 4 +++ 2 files changed, 22 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cde9a4b5/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as index 9ded0e3..110b8d4 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as @@ -7432,20 +7432,24 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME for (; _editedItemPosition.columnIndex != _columns.length; _editedItemPosition.columnIndex++) - { - // If the editedItemPosition is valid, focus it, - // otherwise find one. - if (_columns[_editedItemPosition.columnIndex].editable && - _columns[_editedItemPosition.columnIndex].visible) - { - var row:Array = listItems[_editedItemPosition.rowIndex]; - if (row && row[_editedItemPosition.columnIndex]) - { - foundOne = true; - break; - } - } - } + { + // If the editedItemPosition is valid, focus it, + // otherwise find one. + if (_columns[_editedItemPosition.columnIndex].editable && + _columns[_editedItemPosition.columnIndex].visible) + { + var row:Array = listItems[_editedItemPosition.rowIndex]; + if (row && row[_editedItemPosition.columnIndex]) + { + foundOne = true; + break; + } + } + } + + // leave at last column or an RTE can occur + if (_editedItemPosition.columnIndex >= _columns.length) + _editedItemPosition.columnIndex = _columns.length - 1; if (foundOne) { http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cde9a4b5/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 e3127ef..03d36b5 100644 --- a/frameworks/projects/mx/src/mx/controls/DataGrid.as +++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as @@ -4996,6 +4996,10 @@ public class DataGrid extends DataGridBase implements IIMESupport break; } } + + // leave at last column or an RTE can occur + if (_editedItemPosition.columnIndex >= _columns.length) + _editedItemPosition.columnIndex = _columns.length - 1; if (foundOne) {
