get asdoc to run
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4d6fa028 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4d6fa028 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4d6fa028 Branch: refs/heads/feature/mdl Commit: 4d6fa028df7f0c04cfcdd3c795f194b0accee967 Parents: 09f2d91 Author: Alex Harui <[email protected]> Authored: Fri Nov 11 18:01:29 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Fri Nov 11 18:01:29 2016 -0800 ---------------------------------------------------------------------- frameworks/asdoc-config.xml | 4 ++++ .../src/main/flex/org/apache/flex/core/UIBase.as | 3 --- .../apache/flex/html/beads/CSSTextButtonView.as | 4 ---- .../flex/mobile/beads/MobileWebBrowserView.as | 17 +++++++++-------- 4 files changed, 13 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d6fa028/frameworks/asdoc-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/asdoc-config.xml b/frameworks/asdoc-config.xml index 3dd96e6..9446cdc 100644 --- a/frameworks/asdoc-config.xml +++ b/frameworks/asdoc-config.xml @@ -424,17 +424,21 @@ <exclude-classes> <class>org.apache.flex.utils.Language</class> + <class>org.apache.flex.utils.URLUtils</class> <class>org.apache.flex.core.IFlexJSElement</class> <class>org.apache.flex.core.WrappedHTMLElement</class> <class>org.apache.flex.events.BrowserEvent</class> + <class>org.apache.flex.html.beads.CSSTextButtonView</class> <class>org.apache.flex.maps.google.beads.MapView_original</class> </exclude-classes> <exclude-sources> <path-element>${frameworks_dir}/projects/Language/src/main/flex/org/apache/flex/utils/Language.as</path-element> + <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/utils/URLUtils.as</path-element> <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/core/WrappedHTMLElement.as</path-element> <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/events/BrowserEvent.as</path-element> <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/core/IFlexJSElement.as</path-element> + <path-element>${frameworks_dir}/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as</path-element> <path-element>${frameworks_dir}/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/MapView_original.as</path-element> </exclude-sources> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d6fa028/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as index 0b0dbb5..832c015 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as @@ -968,9 +968,6 @@ package org.apache.flex.core */ public var beads:Array; - COMPILE::SWF - private var _beads:Vector.<IBead>; - /** * @copy org.apache.flex.core.IStrand#addBead() * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d6fa028/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as index 0118a93..aa32eaa 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as @@ -86,10 +86,6 @@ package org.apache.flex.html.beads overSprite.addChild(overTextField); } - private function get host():IUIBase - { - return _strand as IUIBase; - } private var textModel:ITextModel; private var shape:Shape; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d6fa028/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/MobileWebBrowserView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/MobileWebBrowserView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/MobileWebBrowserView.as index 5eb0ab7..4dfe7b6 100644 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/MobileWebBrowserView.as +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/MobileWebBrowserView.as @@ -27,6 +27,7 @@ package org.apache.flex.mobile.beads import org.apache.flex.core.IBeadView; import org.apache.flex.core.IStrand; + import org.apache.flex.core.IStrandWithModel; import org.apache.flex.core.IUIBase; import org.apache.flex.core.UIBase; import org.apache.flex.events.Event; @@ -73,9 +74,9 @@ package org.apache.flex.mobile.beads /** * @private */ - public function get host():UIBase + public function get host():IUIBase { - return _strand as UIBase; + return _strand as IUIBase; } /** @@ -93,13 +94,13 @@ package org.apache.flex.mobile.beads host.addEventListener("widthChanged", handleSizeChange); host.addEventListener("heightChanged", handleSizeChange); - var model:IEventDispatcher = host.model as IEventDispatcher; + var model:IEventDispatcher = (host as IStrandWithModel).model as IEventDispatcher; model.addEventListener("urlChanged", loadPage); - stageWebView.stage = host.$sprite.stage; + stageWebView.stage = host.$displayObject.stage; var hostOrigin:Point = new Point(0,0); - var hostPosition:Point = host.$sprite.localToGlobal(hostOrigin); + var hostPosition:Point = host.$displayObject.localToGlobal(hostOrigin); stageWebView.viewPort = new Rectangle( hostPosition.x, hostPosition.y, host.width, host.height ); } @@ -108,7 +109,7 @@ package org.apache.flex.mobile.beads */ private function loadPage(event:org.apache.flex.events.Event):void { - var model:WebBrowserModel = host.model as WebBrowserModel; + var model:WebBrowserModel = (host as IStrandWithModel).model as WebBrowserModel; stageWebView.loadURL(model.url); } @@ -118,7 +119,7 @@ package org.apache.flex.mobile.beads private function handleSizeChange(event:org.apache.flex.events.Event):void { var hostOrigin:Point = new Point(0,0); - var hostPosition:Point = host.$sprite.localToGlobal(hostOrigin); + var hostPosition:Point = host.$displayObject.localToGlobal(hostOrigin); stageWebView.viewPort = new Rectangle( hostPosition.x, hostPosition.y, host.width, host.height ); } @@ -127,7 +128,7 @@ package org.apache.flex.mobile.beads */ private function handleLocationChange(event:flash.events.Event):void { - var model:WebBrowserModel = host.model as WebBrowserModel; + var model:WebBrowserModel = (host as IStrandWithModel).model as WebBrowserModel; model.setURL(stageWebView.location); host.dispatchEvent(new org.apache.flex.events.Event("locationChanged")); }
