fix up after merge
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e42e19a2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e42e19a2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e42e19a2 Branch: refs/heads/develop Commit: e42e19a24ed9bbe98f715b004f5fe351ff51dc1a Parents: 661fb35 Author: Alex Harui <aha...@apache.org> Authored: Wed Nov 2 08:13:21 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed Nov 2 08:13:21 2016 -0700 ---------------------------------------------------------------------- .../HTML/src/main/flex/org/apache/flex/core/ListBase.as | 10 +++++++++- .../HTML/src/main/flex/org/apache/flex/core/ViewBase.as | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e42e19a2/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as index f9c0aaa..3487822 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as @@ -34,7 +34,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class ListBase extends UIBase implements IContentViewHost + public class ListBase extends UIBase implements IContentViewHost, ILayoutParent { /** * Constructor. @@ -63,6 +63,14 @@ package org.apache.flex.core /** * @private + */ + public function getLayoutHost():ILayoutHost + { + return view as ILayoutHost; + } + + /** + * @private * @suppress {undefinedNames} * Support strandChildren. */ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e42e19a2/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ViewBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ViewBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ViewBase.as index 7e4b65e..f058c4a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ViewBase.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ViewBase.as @@ -48,7 +48,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class ViewBase extends ContainerBase implements IPopUpHost, IApplicationView + public class ViewBase extends ContainerBase implements IPopUpHost, IApplicationView, ILayoutParent { /** * Constructor. @@ -93,5 +93,13 @@ package org.apache.flex.core dispatchEvent(new Event("modelChanged")); } + /** + * @private + */ + public function getLayoutHost():ILayoutHost + { + return view as ILayoutHost; + } + } }