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 2013/05/10 06:34:45 UTC

[1/2] git commit: [flex-asjs] [refs/heads/develop] - Add bead to SWC

Updated Branches:
  refs/heads/develop c05d6e89a -> 74e7819d2


Add bead to SWC


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

Branch: refs/heads/develop
Commit: a9d538c92f9378a280d1c962874b5f6f686b76c1
Parents: c05d6e8
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 9 21:32:19 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 9 21:32:19 2013 -0700

----------------------------------------------------------------------
 frameworks/as/src/FlexJSUIClasses.as |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9d538c9/frameworks/as/src/FlexJSUIClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/FlexJSUIClasses.as b/frameworks/as/src/FlexJSUIClasses.as
index 46ab55b..033ed29 100644
--- a/frameworks/as/src/FlexJSUIClasses.as
+++ b/frameworks/as/src/FlexJSUIClasses.as
@@ -37,6 +37,7 @@ internal class FlexJSUIClasses
 	import org.apache.flex.html.staticControls.beads.CheckBoxBead; CheckBoxBead;
 	import org.apache.flex.html.staticControls.beads.RadioButtonBead; RadioButtonBead;
 	import org.apache.flex.html.staticControls.beads.ComboBoxBead; ComboBoxBead;
+    import org.apache.flex.html.staticControls.beads.ContainerBead; ContainerBead;
 	import org.apache.flex.html.staticControls.beads.models.TextModel; TextModel;
 	import org.apache.flex.html.staticControls.beads.models.ComboBoxModel; ComboBoxModel;
 	import org.apache.flex.html.staticControls.beads.models.ToggleButtonModel; ToggleButtonModel;


[2/2] git commit: [flex-asjs] [refs/heads/develop] - Containers require localtoglobal for popups

Posted by ah...@apache.org.
Containers require localtoglobal for popups


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

Branch: refs/heads/develop
Commit: 74e7819d2484a1aa00312bb5a65d60079074654f
Parents: a9d538c
Author: Alex Harui <ah...@apache.org>
Authored: Thu May 9 21:32:41 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu May 9 21:32:41 2013 -0700

----------------------------------------------------------------------
 .../beads/controllers/DropDownListController.as    |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/74e7819d/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
index be2ef7a..e58e7a7 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
@@ -19,13 +19,14 @@
 package org.apache.flex.html.staticControls.beads.controllers
 {
 	import flash.display.DisplayObject;
+	import flash.geom.Point;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
-	import org.apache.flex.html.staticControls.beads.IDropDownListBead;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.beads.IDropDownListBead;
 
 	public class DropDownListController implements IBead
 	{
@@ -51,8 +52,10 @@ package org.apache.flex.html.staticControls.beads.controllers
             popUpModel.selectedIndex = selectionModel.selectedIndex;
 			DisplayObject(viewBead.popUp).width = DisplayObject(_strand).width;
 			DisplayObject(viewBead.popUp).height = 200;
-			DisplayObject(viewBead.popUp).x = DisplayObject(_strand).x;
-			DisplayObject(viewBead.popUp).y = DisplayObject(_strand).y;
+            var pt:Point = new Point(DisplayObject(_strand).x, DisplayObject(_strand).y);
+            pt = DisplayObject(_strand).parent.localToGlobal(pt);
+			DisplayObject(viewBead.popUp).x = pt.x;
+			DisplayObject(viewBead.popUp).y = pt.y;
             IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
         }