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/06/17 23:28:18 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - Revert
"FLEX-34078 fix callouts closing when selecting dates in DateFields"
Repository: flex-sdk
Updated Branches:
refs/heads/develop 71e817a1d -> ef02abf45
Revert "FLEX-34078 fix callouts closing when selecting dates in DateFields"
This reverts commit 080f5e64d5718d76c51ecf6b07552b8bfc1b112e.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/197b9487
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/197b9487
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/197b9487
Branch: refs/heads/develop
Commit: 197b94876c1350b04963a92aaa1655356fe9f3a3
Parents: 71e817a
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jun 17 12:13:19 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jun 17 12:13:19 2014 -0700
----------------------------------------------------------------------
.../src/spark/components/supportClasses/DropDownController.as | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/197b9487/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 3641111..e1ff2fd 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
@@ -38,7 +38,6 @@ import mx.managers.ISystemManager;
import spark.components.DropDownList;
import spark.events.DropDownEvent;
-import mx.controls.CalendarLayout;
use namespace mx_internal;
@@ -614,8 +613,6 @@ public class DropDownController extends EventDispatcher
var document:Object = (target as IUIComponent).document;
if (("hostComponent" in document) && document.hostComponent is DropDownList)
return;
- if (target.parent is CalendarLayout)
- return;
}
if (hitAreaAdditions != null)
[2/2] git commit: [flex-sdk] [refs/heads/develop] - refix FLEX-34078
in a more general way
Posted by ah...@apache.org.
refix FLEX-34078 in a more general way
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ef02abf4
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ef02abf4
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ef02abf4
Branch: refs/heads/develop
Commit: ef02abf452be8078928d3c18dcc1569a5cf943a4
Parents: 197b948
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jun 17 14:27:42 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jun 17 14:27:42 2014 -0700
----------------------------------------------------------------------
.../src/spark/components/supportClasses/DropDownController.as | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef02abf4/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 e1ff2fd..9ac003e 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
@@ -626,6 +626,12 @@ public class DropDownController extends EventDispatcher
}
}
+ // contains() doesn't cover popups/dropdowns, but owns() does.
+ if (dropDown is IUIComponent)
+ {
+ if ((dropDown as IUIComponent).owns(target))
+ return;
+ }
closeDropDown(true);
}
}