FLEX-28045 Fixed odd layout and possible 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/5ddc3f78 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5ddc3f78 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5ddc3f78 Branch: refs/heads/develop Commit: 5ddc3f78c48768ae8650fc216955ac2fbacba33a Parents: d6b940f Author: Justin Mclean <[email protected]> Authored: Wed Jul 17 18:33:42 2013 +1000 Committer: Justin Mclean <[email protected]> Committed: Wed Jul 17 18:33:42 2013 +1000 ---------------------------------------------------------------------- .../framework/src/mx/managers/FocusManager.as | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ddc3f78/frameworks/projects/framework/src/mx/managers/FocusManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/managers/FocusManager.as b/frameworks/projects/framework/src/mx/managers/FocusManager.as index 249f1e9..4af19fd 100644 --- a/frameworks/projects/framework/src/mx/managers/FocusManager.as +++ b/frameworks/projects/framework/src/mx/managers/FocusManager.as @@ -392,12 +392,12 @@ public class FocusManager extends EventDispatcher implements IFocusManager if (defButton != _lastFocus || _lastFocus == _defaultButton) { - defButton = button; + defButton = button; - if (button) - button.emphasized = true; - } - } + if (button) + button.emphasized = true; + } + } } //---------------------------------- @@ -668,15 +668,15 @@ public class FocusManager extends EventDispatcher implements IFocusManager if (_lastFocus is IButton && !(_lastFocus is IToggleButton)) { defButton = _lastFocus as IButton; - } + } else { // restore the default button to be the original one if (defButton && defButton != _defaultButton) defButton = _defaultButton; - } } } + } /** * @private Useful for debugging @@ -2098,10 +2098,10 @@ public class FocusManager extends EventDispatcher implements IFocusManager return; if (defaultButtonEnabled && event.keyCode == Keyboard.ENTER && - defaultButton && defButton.enabled) + defButton && defButton.enabled) { sendDefaultButtonEvent(); - } + } } /**
