You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/06/20 14:50:09 UTC

[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33592 missed one RTE check

Updated Branches:
  refs/heads/develop 65a1015f8 -> c72ef2dce


FLEX-33592 missed one RTE check


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/185caf93
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/185caf93
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/185caf93

Branch: refs/heads/develop
Commit: 185caf9306cc6a27f99a1288d505f8870cd1dbfa
Parents: 974fcea
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Jun 20 22:47:03 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Jun 20 22:47:03 2013 +1000

----------------------------------------------------------------------
 frameworks/projects/mx/src/mx/controls/MenuBar.as | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/185caf93/frameworks/projects/mx/src/mx/controls/MenuBar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/MenuBar.as b/frameworks/projects/mx/src/mx/controls/MenuBar.as
index 0c79f85..07ddb6e 100644
--- a/frameworks/projects/mx/src/mx/controls/MenuBar.as
+++ b/frameworks/projects/mx/src/mx/controls/MenuBar.as
@@ -2031,7 +2031,7 @@ public class MenuBar extends UIComponent implements IFocusManagerComponent
         {
             item.menuBarItemState = "itemDownSkin";
 
-            if (!isDown)
+            if (m && !isDown)
             {
                 m.supposedToLoseFocus = true;
             


[2/2] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop

Posted by jm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c72ef2dc
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c72ef2dc
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c72ef2dc

Branch: refs/heads/develop
Commit: c72ef2dced1027ad675e8429db5e3f13f6226cc9
Parents: 185caf9 65a1015
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Jun 20 22:49:46 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Jun 20 22:49:46 2013 +1000

----------------------------------------------------------------------
 mustella/jenkins.sh | 72 +++++++++++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 35 deletions(-)
----------------------------------------------------------------------