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 2014/04/18 23:08:40 UTC
[1/3] git commit: [flex-sdk] [refs/heads/release4.12.0] - FLEX-34216
accept patch from Mihai Chira
Repository: flex-sdk
Updated Branches:
refs/heads/release4.12.0 6517a4ba6 -> 9d586e662
FLEX-34216 accept patch from Mihai Chira
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4c350ade
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4c350ade
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4c350ade
Branch: refs/heads/release4.12.0
Commit: 4c350ade7b903fa9ffbafd35b0c0ffff918fd161
Parents: 6517a4b
Author: Alex Harui <ah...@apache.org>
Authored: Thu Apr 17 10:30:43 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Apr 17 10:30:43 2014 -0700
----------------------------------------------------------------------
.../components/gridClasses/DataGridEditor.as | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4c350ade/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
index 2971962..9aaa3c6 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
@@ -532,6 +532,7 @@ public class DataGridEditor
o.removeEventListener(KeyboardEvent.KEY_DOWN, editor_keyDownHandler);
o.removeEventListener(FocusEvent.FOCUS_OUT, editor_focusOutHandler);
+ o.removeEventListener(Event.REMOVED_FROM_STAGE, editor_removedFromStageHandler);
o.removeEventListener(FocusEvent.KEY_FOCUS_CHANGE, editor_keyFocusChangeHandler);
addRemoveFlexEventEnterListener(DisplayObject(o), false);
@@ -673,7 +674,7 @@ public class DataGridEditor
var editor:IEventDispatcher = itemEditorInstance ? itemEditorInstance : editedItemRenderer;
editor.addEventListener(FocusEvent.FOCUS_OUT, editor_focusOutHandler);
-
+ editor.addEventListener(Event.REMOVED_FROM_STAGE, editor_removedFromStageHandler);
// listen for keyStrokes on the itemEditorInstance (which lets the grid supervise for ESC/ENTER)
editor.addEventListener(KeyboardEvent.KEY_DOWN, editor_keyDownHandler);
editor.addEventListener(FocusEvent.KEY_FOCUS_CHANGE, editor_keyFocusChangeHandler, false, 1000);
@@ -1574,6 +1575,23 @@ public class DataGridEditor
* @private
* Closes the itemEditorInstance if the focus is outside of the data grid.
*/
+ private function editor_removedFromStageHandler(event:Event):void
+ {
+ if (itemEditorInstance || editedItemRenderer)
+ {
+ // If we can't save the data, say, because the data was invalid,
+ // then cancel the save.
+ if (!dataGrid.endItemEditorSession())
+ {
+ dataGrid.endItemEditorSession(true);
+ }
+ }
+ }
+
+ /**
+ * @private
+ * Closes the itemEditorInstance if the focus is outside of the data grid.
+ */
private function editor_focusOutHandler(event:FocusEvent):void
{
//trace("editor_focusOutHandler " + event.relatedObject);
[2/3] git commit: [flex-sdk] [refs/heads/release4.12.0] - FLEX-34229
accept patch from Mihai Chira
Posted by ah...@apache.org.
FLEX-34229 accept patch from Mihai Chira
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fd4a17b5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fd4a17b5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fd4a17b5
Branch: refs/heads/release4.12.0
Commit: fd4a17b5acbb732f239c33c09984cc429623c69d
Parents: 4c350ad
Author: Alex Harui <ah...@apache.org>
Authored: Thu Apr 17 10:48:51 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Apr 17 10:48:51 2014 -0700
----------------------------------------------------------------------
.../spark/src/spark/components/gridClasses/DataGridEditor.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fd4a17b5/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
index 9aaa3c6..ef8863b 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
@@ -513,7 +513,7 @@ public class DataGridEditor
{
// trace("destroyItemEditor");
if (grid.root)
- grid.systemManager.addEventListener(Event.DEACTIVATE, deactivateHandler, false, 0, true);
+ grid.systemManager.removeEventListener(Event.DEACTIVATE, deactivateHandler);
grid.systemManager.getSandboxRoot().
removeEventListener(MouseEvent.MOUSE_DOWN, sandBoxRoot_mouseDownHandler, true);
[3/3] git commit: [flex-sdk] [refs/heads/release4.12.0] - FLEX-34013
- scrap is always plain text at this point
Posted by ah...@apache.org.
FLEX-34013 - scrap is always plain text at this point
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9d586e66
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9d586e66
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9d586e66
Branch: refs/heads/release4.12.0
Commit: 9d586e6629c76e38f485df9e832d39a7b3542f34
Parents: fd4a17b
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 18 13:53:53 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 18 13:53:53 2014 -0700
----------------------------------------------------------------------
.../projects/spark/src/spark/components/RichEditableText.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9d586e66/frameworks/projects/spark/src/spark/components/RichEditableText.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/RichEditableText.as b/frameworks/projects/spark/src/spark/components/RichEditableText.as
index e37c075..ed5f26d 100644
--- a/frameworks/projects/spark/src/spark/components/RichEditableText.as
+++ b/frameworks/projects/spark/src/spark/components/RichEditableText.as
@@ -4764,8 +4764,8 @@ package spark.components
{
pastedText = pastedText.replace(ALL_NEWLINES_REGEXP, "");
po.textScrap =
- TextClipboard.importToScrap(pastedText, po.textScrap.isPlainText() ?
- TextConverter.PLAIN_TEXT_FORMAT : TextConverter.TEXT_LAYOUT_FORMAT);
+ TextClipboard.importToScrap(pastedText,
+ TextConverter.PLAIN_TEXT_FORMAT);
}
}
}