You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/05/30 23:41:52 UTC
[3/3] git commit: [flex-sdk] [refs/heads/develop] - Flex-33450
DataGrid RTE
Flex-33450 DataGrid 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/307ff74f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/307ff74f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/307ff74f
Branch: refs/heads/develop
Commit: 307ff74fed6b5ccd82816d65c0eb897bcff02db9
Parents: 53430d6
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 30 22:39:28 2013 +0100
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 30 22:41:34 2013 +0100
----------------------------------------------------------------------
frameworks/projects/mx/src/mx/controls/DataGrid.as | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/307ff74f/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 f00cf8e..34145e3 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -22,6 +22,7 @@ package mx.controls
import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
+import flash.display.InteractiveObject;
import flash.display.Graphics;
import flash.display.Shape;
import flash.display.Sprite;
@@ -4474,7 +4475,10 @@ public class DataGrid extends DataGridBase implements IIMESupport
UIComponent(itemEditorInstance).drawFocus(false);
// setfocus back to us so something on stage has focus
- deferFocus();
+ // only if focus is null or is in this DG
+ var focusComp:InteractiveObject = getFocus();
+ if (focusComp == null || contains(focusComp))
+ deferFocus();
// defer focus can cause focusOutHandler to destroy the editor
// and make itemEditorInstance null