Updated Branches: refs/heads/develop 0d2d480cb -> 3d5ba71c1
FLEX-33741 stop propagation of escape key when drop down is shown Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3d5ba71c Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3d5ba71c Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3d5ba71c Branch: refs/heads/develop Commit: 3d5ba71c19aeff58d5b8f0bc355e441c956e1f80 Parents: 0d2d480 Author: Justin Mclean <[email protected]> Authored: Thu Sep 19 12:55:48 2013 +1000 Committer: Justin Mclean <[email protected]> Committed: Thu Sep 19 12:55:48 2013 +1000 ---------------------------------------------------------------------- frameworks/projects/mx/src/mx/controls/DateField.as | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3d5ba71c/frameworks/projects/mx/src/mx/controls/DateField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/controls/DateField.as b/frameworks/projects/mx/src/mx/controls/DateField.as index edbd472..6318633 100644 --- a/frameworks/projects/mx/src/mx/controls/DateField.as +++ b/frameworks/projects/mx/src/mx/controls/DateField.as @@ -2647,11 +2647,12 @@ public class DateField extends ComboBase } else if (event.keyCode == Keyboard.ESCAPE) { - if (showingDropdown) + if (showingDropdown) { selectedDate = lastSelectedDate; - displayDropdown(false, event); - if (!editable) - event.stopPropagation(); + displayDropdown(false, event); + if (!editable) + event.stopPropagation(); + } } else if (event.keyCode == Keyboard.ENTER) {
