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 2016/11/26 07:19:00 UTC
git commit: [flex-asjs] [refs/heads/develop] - fix bugs in exploded
list
Repository: flex-asjs
Updated Branches:
refs/heads/develop 11e0f755b -> ca2001243
fix bugs in exploded list
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ca200124
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ca200124
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ca200124
Branch: refs/heads/develop
Commit: ca20012430fd17e71fc57de62beba91120da863f
Parents: 11e0f75
Author: Alex Harui <ah...@apache.org>
Authored: Fri Nov 25 23:18:43 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Nov 25 23:18:43 2016 -0800
----------------------------------------------------------------------
.../HTML/src/main/flex/org/apache/flex/html/List.as | 15 +++++++++++----
.../flex/org/apache/flex/html/beads/ContainerView.as | 4 ++--
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ca200124/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as
index 17c8b3f..4f3ba74 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as
@@ -90,6 +90,7 @@ package org.apache.flex.html
public function List()
{
super();
+ addEventListener("beadsAdded", beadsAddedHandler);
}
/**
@@ -267,7 +268,15 @@ package org.apache.flex.html
override public function addedToParent():void
{
super.addedToParent();
-
+
+ dispatchEvent(new Event("initComplete"));
+ }
+
+ /**
+ * @private
+ */
+ private function beadsAddedHandler(e:Event):void
+ {
if (getBeadByType(IDataProviderItemRendererMapper) == null)
{
var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper;
@@ -279,10 +288,8 @@ package org.apache.flex.html
itemRendererFactory = new (ValuesManager.valuesImpl.getValue(this, "iItemRendererClassFactory")) as IItemRendererClassFactory;
addBead(itemRendererFactory);
}
-
- dispatchEvent(new Event("initComplete"));
}
-
+
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
*/
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ca200124/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
index d62e799..b0f9f49 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
@@ -210,7 +210,7 @@ package org.apache.flex.html.beads
// listen for initComplete to signal that the strand is set with its size
// and beads.
- host.addEventListener("initComplete", initCompleteHandler);
+ host.addEventListener("beadsAdded", beadsAddedHandler);
}
/**
@@ -222,7 +222,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- protected function initCompleteHandler(event:Event):void
+ protected function beadsAddedHandler(event:Event):void
{
var ilc:ILayoutChild = host as ILayoutChild;
// Complete the setup if the height is sized to content or has been explicitly set