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

git commit: [flex-asjs] [refs/heads/develop] - PanelBead adds children to ControlBar so ControlBar does not have to make any assumptions about its children.

Updated Branches:
  refs/heads/develop 4673d3da1 -> b8b9e6293


PanelBead adds children to ControlBar so ControlBar does not have to make any assumptions about its children.


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

Branch: refs/heads/develop
Commit: b8b9e6293ec77dc1c9dcfed0e9c1eabf349d683b
Parents: 4673d3d
Author: Peter Ent <pe...@apache.org>
Authored: Thu May 30 14:06:21 2013 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu May 30 14:06:21 2013 -0400

----------------------------------------------------------------------
 .../apache/flex/html/staticControls/ControlBar.as  |    9 ---------
 .../flex/html/staticControls/beads/PanelBead.as    |    6 +++++-
 2 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8b9e629/frameworks/as/src/org/apache/flex/html/staticControls/ControlBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/ControlBar.as b/frameworks/as/src/org/apache/flex/html/staticControls/ControlBar.as
index 70ef494..6514041 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/ControlBar.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/ControlBar.as
@@ -44,14 +44,5 @@ package org.apache.flex.html.staticControls
 				addBead(layout);
 			}
 		}
-		
-		public function transferChildren( list:Array ) : void
-		{
-			for each(var comp:IUIBase in list) {
-				comp.addToParent(this);
-			}
-			
-			childrenAdded();
-		}
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8b9e629/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
index 185ba0e..d465401 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as
@@ -67,7 +67,11 @@ package org.apache.flex.html.staticControls.beads
 				_controlBar = new ControlBar();
 				_controlBar.initModel();
 				_controlBar.initSkin();
-				_controlBar.transferChildren(controlBarItems);
+				
+				for each(var comp:IUIBase in controlBarItems) {
+					comp.addToParent(_controlBar);
+				}
+				
 				Container(_strand).addChild(controlBar);
 			}