Repository: flex-asjs Updated Branches: refs/heads/refactor-sprite dbf0df3a3 -> 98822cbc6
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as index f8b2142..451a1a8 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as @@ -76,8 +76,8 @@ package org.apache.flex.html.beads.controllers */ override protected function thumbMouseDownHandler(event:MouseEvent):void { - sbView.thumb.button.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler); - sbView.thumb.button.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler); + sbView.thumb.$button.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler); + sbView.thumb.$button.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler); thumbDownY = event.screenY; lastThumbY = sbView.thumb.y; } @@ -94,8 +94,8 @@ package org.apache.flex.html.beads.controllers private function thumbMouseUpHandler(event:MouseEvent):void { - sbView.thumb.button.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler); - sbView.thumb.button.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler); + sbView.thumb.$button.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler); + sbView.thumb.$button.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as index 4e44b1d..00f5a83 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as @@ -66,7 +66,7 @@ package org.apache.flex.html.supportClasses { COMPILE::SWF { - sprite.removeChildren(0); + $sprite.removeChildren(0); } COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as index 63fcda5..dff8d5d 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as @@ -126,7 +126,7 @@ package org.apache.flex.html.supportClasses super.addedToParent(); background = new Sprite(); - sprite.addChild(background); + $sprite.addChild(background); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/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 2380960..c3b7b09 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 @@ -261,7 +261,7 @@ package org.apache.flex.html.supportClasses _verticalScroller.x : viewportWidth, (_horizontalScroller != null && _horizontalScroller.visible) ? _horizontalScroller.y : viewportHeight); - contentArea.sprite.scrollRect = rect; + contentArea.$sprite.scrollRect = rect; return contentSize; } @@ -313,9 +313,9 @@ package org.apache.flex.html.supportClasses { var host:UIBase = UIBase(_strand); var vpos:Number = ScrollBarModel(_verticalScroller.model).value; - var rect:Rectangle = contentArea.sprite.scrollRect; + var rect:Rectangle = contentArea.$sprite.scrollRect; rect.y = vpos; - contentArea.sprite.scrollRect = rect; + contentArea.$sprite.scrollRect = rect; _verticalScrollPosition = vpos; } @@ -325,9 +325,9 @@ package org.apache.flex.html.supportClasses { var host:UIBase = UIBase(_strand); var hpos:Number = ScrollBarModel(_horizontalScroller.model).value; - var rect:Rectangle = contentArea.sprite.scrollRect; + var rect:Rectangle = contentArea.$sprite.scrollRect; rect.x = hpos; - contentArea.sprite.scrollRect = rect; + contentArea.$sprite.scrollRect = rect; _horizontalScrollPosition = hpos; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/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 91bf787..98c0af7 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.$textField); adjustSize(); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/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 a75e0cc..5eb0ab7 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 @@ -96,10 +96,10 @@ package org.apache.flex.mobile.beads var model:IEventDispatcher = host.model as IEventDispatcher; model.addEventListener("urlChanged", loadPage); - stageWebView.stage = host.sprite.stage; + stageWebView.stage = host.$sprite.stage; var hostOrigin:Point = new Point(0,0); - var hostPosition:Point = host.sprite.localToGlobal(hostOrigin); + var hostPosition:Point = host.$sprite.localToGlobal(hostOrigin); stageWebView.viewPort = new Rectangle( hostPosition.x, hostPosition.y, host.width, host.height ); } @@ -118,7 +118,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.$sprite.localToGlobal(hostOrigin); stageWebView.viewPort = new Rectangle( hostPosition.x, hostPosition.y, host.width, host.height ); }
