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 2014/02/18 23:02:40 UTC
[1/3] git commit: [flex-sdk] [refs/heads/release4.12.0] - Fixed
regression in 4.12RC2 (labelPlacement style conflict)
Repository: flex-sdk
Updated Branches:
refs/heads/release4.12.0 3c4efbb09 -> 6e46938f6
Fixed regression in 4.12RC2 (labelPlacement style conflict)
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/0949d97d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/0949d97d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/0949d97d
Branch: refs/heads/release4.12.0
Commit: 0949d97d086442068b19cf7b63aaa2f3fef64e0c
Parents: 3c4efbb
Author: mamsellem <ma...@systar.com>
Authored: Tue Feb 18 11:09:48 2014 +0100
Committer: mamsellem <ma...@systar.com>
Committed: Tue Feb 18 11:09:48 2014 +0100
----------------------------------------------------------------------
frameworks/projects/spark/src/spark/components/CheckBox.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0949d97d/frameworks/projects/spark/src/spark/components/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/CheckBox.as b/frameworks/projects/spark/src/spark/components/CheckBox.as
index c72f6c8..92ceed3 100644
--- a/frameworks/projects/spark/src/spark/components/CheckBox.as
+++ b/frameworks/projects/spark/src/spark/components/CheckBox.as
@@ -87,7 +87,7 @@ use namespace mx_internal;
* @playerversion AIR 1.5
* @productversion Flex 4
*/
-[Style(name="labelPlacement", type="String", enumeration="top,bottom,left,right", inherit="no", defaultValue="right")]
+[Style(name="labelPlacement", type="String", enumeration="top,bottom,left,right", inherit="yes")]
/**
[3/3] git commit: [flex-sdk] [refs/heads/release4.12.0] - Merge
remote-tracking branch 'origin/develop' into release4.12.0
Posted by jm...@apache.org.
Merge remote-tracking branch 'origin/develop' into release4.12.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6e46938f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6e46938f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6e46938f
Branch: refs/heads/release4.12.0
Commit: 6e46938f6158366984822922e53bc6f44026d299
Parents: 765c12a 0949d97
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Feb 19 09:02:11 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Feb 19 09:02:11 2014 +1100
----------------------------------------------------------------------
frameworks/projects/spark/src/spark/components/CheckBox.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: [flex-sdk] [refs/heads/release4.12.0] - FLEX-34088
Don't close when selecting something from a DropDownList + cleaned up code a
little
Posted by jm...@apache.org.
FLEX-34088 Don't close when selecting something from a DropDownList + cleaned up code a little
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/765c12a9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/765c12a9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/765c12a9
Branch: refs/heads/release4.12.0
Commit: 765c12a99184332a7000d27d66d5ad4b6cfc5dd3
Parents: 3c4efbb
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Feb 19 09:01:06 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Feb 19 09:01:06 2014 +1100
----------------------------------------------------------------------
.../components/supportClasses/DropDownController.as | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/765c12a9/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
index dfe82ba..c076211 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
@@ -30,11 +30,13 @@ import flash.events.TimerEvent;
import flash.ui.Keyboard;
import flash.utils.Timer;
+import mx.core.IUIComponent;
import mx.core.mx_internal;
import mx.events.FlexEvent;
import mx.events.SandboxMouseEvent;
import mx.managers.ISystemManager;
+import spark.components.DropDownList;
import spark.events.DropDownEvent;
use namespace mx_internal;
@@ -604,13 +606,18 @@ public class DropDownController extends EventDispatcher
var target:DisplayObject = event.target as DisplayObject;
if (openButton && target && openButton.contains(target))
return;
-
+
+ // don't close if something just been selected in a DropDownList
+ if (target is IUIComponent && (target as IUIComponent).document.hostComponent is DropDownList)
+ return;
+
if (hitAreaAdditions != null)
{
- for (var i:int = 0;i<hitAreaAdditions.length;i++)
+ var length:int = hitAreaAdditions.length;
+ for (var i:int = 0;i < length; i++)
{
- if (hitAreaAdditions[i] == event.target ||
- ((hitAreaAdditions[i] is DisplayObjectContainer) && DisplayObjectContainer(hitAreaAdditions[i]).contains(event.target as DisplayObject)))
+ if (hitAreaAdditions[i] == target ||
+ ((hitAreaAdditions[i] is DisplayObjectContainer) && DisplayObjectContainer(hitAreaAdditions[i]).contains(target)))
return;
}
}