http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as index 225e0ac..fd0f118 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as @@ -73,13 +73,15 @@ package org.apache.flex.html.beads.layouts * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 + * @flexjsignorecoercion HTMLElement + * @flexjsignorecoercion org.apache.flex.core.IUIBase */ public function set strand(value:IStrand):void { host = value as ILayoutChild; COMPILE::JS { - (value as IUIBase).element.style.display = 'block'; + ((value as IUIBase).element as HTMLElement).style.display = 'block'; } }
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as index 15b6587..f7ebf01 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.supportClasses { + import org.apache.flex.core.IChild; import org.apache.flex.core.IContentView; import org.apache.flex.core.IItemRenderer; import org.apache.flex.core.IItemRendererParent; @@ -58,7 +59,7 @@ package org.apache.flex.html.supportClasses /** * @private */ - override public function addElement(c:Object, dispatchEvent:Boolean = true):void + override public function addElement(c:IChild, dispatchEvent:Boolean = true):void { super.addElement(c, dispatchEvent); @@ -72,7 +73,7 @@ package org.apache.flex.html.supportClasses /** * @private */ - override public function removeElement(c:Object, dispatchEvent:Boolean = true):void + override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void { super.removeElement(c, dispatchEvent); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as index c3b7b09..74dd040 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as @@ -137,11 +137,14 @@ package org.apache.flex.html.supportClasses } } + /** + * @flexjsignorecoercion HTMLElement + */ COMPILE::JS override public function set strand(value:IStrand):void { super.strand = value; - contentView.element.style.overflow = 'auto'; + (contentView.element as HTMLElement).style.overflow = 'auto'; } private var viewportWidth:Number; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as index 98c0af7..2ff3cbf 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as @@ -77,7 +77,7 @@ package org.apache.flex.html.supportClasses { super.addedToParent(); - $sprite.addChild(textField.$textField); + $sprite.addChild(textField); adjustSize(); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as index fa7d668..05f93cb 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as @@ -44,7 +44,7 @@ package org.apache.flex.html.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase, IFlexJSElement + public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase { /** * constructor. @@ -548,5 +548,10 @@ package org.apache.flex.html.supportClasses return IUIBase(parent).topMostEventDispatcher; } + public function get $displayObject():DisplayObject + { + return this; + } + } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/HTML/src/main/resources/basic-as-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/resources/basic-as-manifest.xml b/frameworks/projects/HTML/src/main/resources/basic-as-manifest.xml index 26b7d42..f5e8475 100644 --- a/frameworks/projects/HTML/src/main/resources/basic-as-manifest.xml +++ b/frameworks/projects/HTML/src/main/resources/basic-as-manifest.xml @@ -24,7 +24,7 @@ <!-- component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState"/ --> <!--<component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView"/>--> - <component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer"/> + <!--<component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer"/>--> <component id="HScrollBar" class="org.apache.flex.html.supportClasses.HScrollBar"/> <component id="VScrollBar" class="org.apache.flex.html.supportClasses.VScrollBar"/> <!-- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/IViewManagerView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/IViewManagerView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/IViewManagerView.as index 6aaa9d3..02a7113 100644 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/IViewManagerView.as +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/IViewManagerView.as @@ -18,6 +18,8 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mobile { + import org.apache.flex.core.IChild; + /** * The IViewManagerView interface is implemented by any class that can be managed by * an IViewManager. @@ -27,7 +29,7 @@ package org.apache.flex.mobile * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public interface IViewManagerView + public interface IViewManagerView extends IChild { /** * The parent view manager. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagerBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagerBase.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagerBase.as index 67c9fd0..0c54891 100644 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagerBase.as +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ManagerBase.as @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mobile { + import org.apache.flex.core.IChild; import org.apache.flex.core.IChrome; import org.apache.flex.core.UIBase; import org.apache.flex.events.Event; @@ -118,7 +119,7 @@ package org.apache.flex.mobile * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - override public function addElement(c:Object, dispatchEvent:Boolean=true):void + override public function addElement(c:IChild, dispatchEvent:Boolean=true):void { if (c is IChrome) { super.addElementAt(c,0,dispatchEvent); @@ -134,7 +135,7 @@ package org.apache.flex.mobile /** * @private. */ - override public function addElementAt(c:Object, index:int, dispatchEvent:Boolean=true):void + override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean=true):void { if (c is IChrome) { super.addElementAt(c, index, dispatchEvent); @@ -147,7 +148,7 @@ package org.apache.flex.mobile /** * @private */ - override public function removeElement(c:Object, dispatchEvent:Boolean=true):void + override public function removeElement(c:IChild, dispatchEvent:Boolean=true):void { if (c is IChrome) { super.removeElement(c, dispatchEvent); @@ -160,7 +161,7 @@ package org.apache.flex.mobile /** * @private */ - override public function getElementAt(index:int):Object + override public function getElementAt(index:int):IChild { return _contentArea.getElementAt(index); } @@ -168,7 +169,7 @@ package org.apache.flex.mobile /** * @private */ - override public function getElementIndex(c:Object):int + override public function getElementIndex(c:IChild):int { return _contentArea.getElementIndex(c); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as index ffa26c5..225b7d4 100644 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as @@ -18,10 +18,11 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mobile { + import org.apache.flex.core.IChild; import org.apache.flex.events.Event; import org.apache.flex.html.Container; - import org.apache.flex.mobile.IViewManagerView; import org.apache.flex.mobile.IViewManager; + import org.apache.flex.mobile.IViewManagerView; import org.apache.flex.mobile.chrome.NavigationBar; import org.apache.flex.mobile.chrome.ToolBar; import org.apache.flex.mobile.models.ViewManagerModel; @@ -148,7 +149,7 @@ package org.apache.flex.mobile public function pop():void { if (ViewManagerModel(model).views.length > 1) { - var lastView:Object = ViewManagerModel(model).popView(); + var lastView:IChild = ViewManagerModel(model).popView() as IChild; removeElement(_topView); addElement(lastView); _topView = lastView as IViewManagerView; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/472c7af2/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/models/ViewManagerModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/models/ViewManagerModel.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/models/ViewManagerModel.as index 20a55ff..cc20bb6 100644 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/models/ViewManagerModel.as +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/models/ViewManagerModel.as @@ -19,6 +19,7 @@ package org.apache.flex.mobile.models { import org.apache.flex.core.IBeadModel; + import org.apache.flex.core.IChild; import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; import org.apache.flex.events.Event; @@ -98,7 +99,7 @@ package org.apache.flex.mobile.models * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function pushView(value:Object):void + public function pushView(value:IChild):void { _views.push(value); _selectedIndex = _views.length - 1; @@ -114,7 +115,7 @@ package org.apache.flex.mobile.models * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function popView():Object + public function popView():IChild { if (_views.length > 1) { var discard:Object = _views.pop();
