Renamed composed display list objects Added DisplayUtils
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/98822cbc Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/98822cbc Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/98822cbc Branch: refs/heads/refactor-sprite Commit: 98822cbc68f03aab09ec560ed64794390d49a0c7 Parents: dbf0df3 Author: Harbs <ha...@in-tools.com> Authored: Thu Jul 28 15:01:28 2016 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Thu Jul 28 15:01:28 2016 +0300 ---------------------------------------------------------------------- .../charts/supportClasses/ChartAxisGroup.as | 2 +- .../projects/Core/src/main/flex/CoreClasses.as | 1 + .../flex/org/apache/flex/core/Application.as | 6 +- .../main/flex/org/apache/flex/core/CSSShape.as | 6 +- .../main/flex/org/apache/flex/core/CSSSprite.as | 2 +- .../flex/org/apache/flex/core/CSSTextField.as | 24 +- .../org/apache/flex/core/HTMLElementWrapper.as | 10 +- .../main/flex/org/apache/flex/core/IUIBase.as | 11 + .../main/flex/org/apache/flex/core/UIBase.as | 8 +- .../flex/org/apache/flex/core/UIButtonBase.as | 31 +- .../main/flex/org/apache/flex/geom/Rectangle.as | 459 ++++++++++--------- .../flex/org/apache/flex/utils/DisplayUtils.as | 130 ++++++ .../beads/CSSContentAndTextToggleButtonView.as | 32 +- .../flex/flat/beads/CSSScrollBarButtonView.as | 6 +- .../apache/flex/flat/beads/DropDownListView.as | 24 +- .../flex/html/beads/FormatableTextInputView.as | 2 +- .../flex/maps/google/beads/GoogleMapView.as | 2 +- .../org/apache/flex/graphics/IGraphicShape.as | 7 - .../src/main/flex/org/apache/flex/svg/Circle.as | 4 +- .../flex/org/apache/flex/svg/CompoundGraphic.as | 20 +- .../main/flex/org/apache/flex/svg/Ellipse.as | 4 +- .../flex/org/apache/flex/svg/GraphicShape.as | 6 +- .../src/main/flex/org/apache/flex/svg/Path.as | 4 +- .../src/main/flex/org/apache/flex/svg/Rect.as | 6 +- .../src/main/flex/org/apache/flex/svg/Text.as | 2 +- .../accessories/NumericOnlyTextInputBead.as | 2 +- .../flex/html/accessories/TextPromptBead.as | 4 +- .../flex/html/beads/BackgroundImageBead.as | 4 +- .../html/beads/CSSImageAndTextButtonView.as | 14 +- .../apache/flex/html/beads/CSSTextButtonView.as | 12 +- .../org/apache/flex/html/beads/CheckBoxView.as | 2 +- .../org/apache/flex/html/beads/ComboBoxView.as | 8 +- .../apache/flex/html/beads/DropDownListView.as | 6 +- .../org/apache/flex/html/beads/HRuleView.as | 8 +- .../apache/flex/html/beads/HScrollBarView.as | 8 +- .../flex/html/beads/ImageAndTextButtonView.as | 2 +- .../org/apache/flex/html/beads/ImageView.as | 4 +- .../apache/flex/html/beads/RadioButtonView.as | 2 +- .../flex/html/beads/SingleLineBorderBead.as | 4 +- .../org/apache/flex/html/beads/SliderView.as | 4 +- .../org/apache/flex/html/beads/SpinnerView.as | 4 +- .../org/apache/flex/html/beads/TextAreaView.as | 6 +- .../apache/flex/html/beads/TextButtonView.as | 8 +- .../apache/flex/html/beads/TextFieldViewBase.as | 4 +- .../org/apache/flex/html/beads/VRuleView.as | 8 +- .../apache/flex/html/beads/VScrollBarView.as | 8 +- .../EditableTextKeyboardController.as | 2 +- .../controllers/HScrollBarMouseController.as | 8 +- .../controllers/VScrollBarMouseController.as | 8 +- .../html/supportClasses/ContainerContentArea.as | 2 +- .../html/supportClasses/DataItemRenderer.as | 2 +- .../html/supportClasses/ScrollingViewport.as | 10 +- .../html/supportClasses/StringItemRenderer.as | 2 +- .../flex/mobile/beads/MobileWebBrowserView.as | 6 +- 54 files changed, 577 insertions(+), 394 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/supportClasses/ChartAxisGroup.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/supportClasses/ChartAxisGroup.as b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/supportClasses/ChartAxisGroup.as index 5c6e966..f083cf3 100644 --- a/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/supportClasses/ChartAxisGroup.as +++ b/frameworks/projects/Charts/src/main/flex/org/apache/flex/charts/supportClasses/ChartAxisGroup.as @@ -62,7 +62,7 @@ package org.apache.flex.charts.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/Core/src/main/flex/CoreClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as index a1cfe9c..98487bf1 100644 --- a/frameworks/projects/Core/src/main/flex/CoreClasses.as +++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as @@ -116,6 +116,7 @@ internal class CoreClasses } import org.apache.flex.utils.ColorUtil; ColorUtil; import org.apache.flex.utils.CSSContainerUtils; CSSContainerUtils; + import org.apache.flex.utils.DisplayUtils; DisplayUtils; COMPILE::SWF { import org.apache.flex.utils.dbg.DOMPathUtil; DOMPathUtil; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as index 657c9f8..939655f 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as @@ -424,7 +424,7 @@ package org.apache.flex.core if(_elements == null) _elements = []; _elements[_elements.length] = c; - this.addChild(c.sprite); + this.addChild(c.$sprite); c.parent = this; if (c is IUIBase) { @@ -453,7 +453,7 @@ package org.apache.flex.core _elements = []; _elements.splice(index,0,c); - this.addChildAt(c.sprite,index); + this.addChildAt(c.$sprite,index); c.parent = this; if (c is IUIBase) @@ -545,7 +545,7 @@ package org.apache.flex.core _elements.splice(idx,1); c.parent = null; } - this.removeChild(c.sprite as DisplayObject); + this.removeChild(c.$sprite as DisplayObject); } COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSShape.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSShape.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSShape.as index 9e2d770..f822206 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSShape.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSShape.as @@ -55,11 +55,11 @@ package org.apache.flex.core private var _shape:Shape; - public function get shape():Shape + public function get $shape():Shape { return _shape; } - public function set shape(val:Shape):void + public function set $shape(val:Shape):void { _shape = val; } @@ -239,7 +239,7 @@ package org.apache.flex.core */ public function draw(w:Number, h:Number):void { - CSSBorderUtils.draw(shape.graphics, w, h, shape, state, true); + CSSBorderUtils.draw(_shape.graphics, w, h, _shape, state, true); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSSprite.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSSprite.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSSprite.as index a363b9c..9ca030e 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSSprite.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSSprite.as @@ -156,7 +156,7 @@ package org.apache.flex.core */ public function draw(w:Number, h:Number):void { - CSSBorderUtils.draw(sprite.graphics, w, h, sprite, state, true); + CSSBorderUtils.draw($sprite.graphics, w, h, $sprite, state, true); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as index 944c4bd..31d5436 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as @@ -19,6 +19,7 @@ package org.apache.flex.core { COMPILE::SWF { + import flash.display.DisplayObject; import flash.text.TextField; import flash.text.TextFieldAutoSize; import flash.text.TextFormat; @@ -57,16 +58,21 @@ package org.apache.flex.core private var _textField:TextField; - public function get textField():TextField + public function get $textField():TextField { return _textField; } - public function set textField(value:TextField):void + public function set $textField(value:TextField):void { _textField = value; } + public function get $displayObject():DisplayObject + { + return _textField; + } + private var _parent:IUIBase; public function get parent():IUIBase { @@ -396,30 +402,30 @@ package org.apache.flex.core var align:Object = ValuesManager.valuesImpl.getValue(sp, "text-align", styleState); if (align == "center") { - textField.autoSize = TextFieldAutoSize.NONE; + _textField.autoSize = TextFieldAutoSize.NONE; tf.align = "center"; } else if (align == "right") { tf.align = "right"; - textField.autoSize = TextFieldAutoSize.NONE; + _textField.autoSize = TextFieldAutoSize.NONE; } if (!parentDrawsBackground) { var backgroundColor:Object = ValuesManager.valuesImpl.getValue(sp, "background-color", styleState); if (backgroundColor != null) { - textField.background = true; - textField.backgroundColor = CSSUtils.toColor(backgroundColor); + _textField.background = true; + _textField.backgroundColor = CSSUtils.toColor(backgroundColor); } } - textField.defaultTextFormat = tf; - textField.text = value; + _textField.defaultTextFormat = tf; + _textField.text = value; } public function get text():String { - return textField.text; + return _textField.text; } private function updateStyles(event:Event):void http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as index d939b52..acb8429 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as @@ -20,6 +20,7 @@ package org.apache.flex.core { COMPILE::SWF { + import flash.display.DisplayObject; import flash.display.Sprite; } @@ -44,16 +45,21 @@ package org.apache.flex.core private var _sprite:Sprite; - public function get sprite():Sprite + public function get $sprite():Sprite { return _sprite; } - public function set sprite(value:Sprite):void + public function set $sprite(value:Sprite):void { _sprite = value; } + public function get $displayObject():DisplayObject + { + return _sprite; + } + protected var _elements:Array; /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IUIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IUIBase.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IUIBase.as index a7d524b..60b3029 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IUIBase.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IUIBase.as @@ -19,6 +19,10 @@ package org.apache.flex.core { import org.apache.flex.events.IEventDispatcher; + COMPILE::SWF + { + import flash.display.DisplayObject; + } /** * The IUIBase interface is the basic interface for user interface components. @@ -30,6 +34,13 @@ package org.apache.flex.core */ public interface IUIBase extends IStrand, IEventDispatcher { + + /** + * + * @private + */ + COMPILE::SWF + function get $displayObject():DisplayObject; /** * Each IUIBase has an element that is actually added to * the platform's display list DOM. It may not be the actual http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as index 7ec2974..51f4ffd 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as @@ -1090,7 +1090,7 @@ package org.apache.flex.core if(_elements == null) _elements = []; _elements[_elements.length] = c; - sprite.addChild(c.sprite); + $sprite.addChild(c.$sprite); c.parent = this; if (c is IUIBase) { @@ -1121,7 +1121,7 @@ package org.apache.flex.core _elements = []; _elements.splice(index,0,c); - sprite.addChildAt(c.sprite,index); + $sprite.addChildAt(c.$sprite,index); c.parent = this; if (c is IUIBase) @@ -1214,7 +1214,7 @@ package org.apache.flex.core _elements.splice(idx,1); c.parent = null; } - sprite.removeChild(c.sprite as DisplayObject); + $sprite.removeChild(c.$sprite as DisplayObject); } COMPILE::JS { @@ -1381,7 +1381,7 @@ package org.apache.flex.core { if (!_stageProxy) { - _stageProxy = new StageProxy(sprite.stage); + _stageProxy = new StageProxy($sprite.stage); _stageProxy.addEventListener("removedFromStage", stageProxy_removedFromStageHandler); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as index 55916a9..d1976f8 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIButtonBase.as @@ -80,15 +80,20 @@ package org.apache.flex.core private var _button:SimpleButton; - public function get button():SimpleButton + public function get $button():SimpleButton { return _button; } - public function set button(val:SimpleButton):void + public function set $button(val:SimpleButton):void { _button = val; } + public function get $displayObject():DisplayObject + { + return _button; + } + private var _parent:IUIBase; public function get parent():IUIBase { @@ -117,8 +122,8 @@ package org.apache.flex.core */ public function set x(value:Number):void { - if (button.x != value) { - button.x = _x = value; + if (_button.x != value) { + _button.x = _x = value; if (!style) style = { left: value }; else @@ -138,8 +143,8 @@ package org.apache.flex.core */ public function set y(value:Number):void { - if (button.y != value) { - button.y = _y = value; + if (_button.y != value) { + _button.y = _y = value; if (!style) style = { top: value }; else @@ -163,7 +168,7 @@ package org.apache.flex.core */ protected function get $y():Number { - return button.y; + return _button.y; } private var _explicitWidth:Number; @@ -366,7 +371,7 @@ package org.apache.flex.core */ public function get $width():Number { - return button.width; + return _button.width; } private var _height:Number; @@ -417,7 +422,7 @@ package org.apache.flex.core */ public function get $height():Number { - return button.height; + return _button.height; } /** @@ -505,7 +510,7 @@ package org.apache.flex.core */ public function setX(value:Number):void { - button.x = value; + _button.x = value; } /** @@ -518,7 +523,7 @@ package org.apache.flex.core */ public function setY(value:Number):void { - button.y = value; + _button.y = value; } /** @@ -527,14 +532,14 @@ package org.apache.flex.core [Bindable("visibleChanged")] public function set visible(value:Boolean):void { - button.visible = value; + _button.visible = value; dispatchEvent(new Event(value?"show":"hide")); dispatchEvent(new Event("visibleChanged")); } public function get visible():Boolean { - return button.visible; + return _button.visible; } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as index c2aa7de..99ed348 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Rectangle.as @@ -19,243 +19,258 @@ package org.apache.flex.geom { -/** - * The Rectangle class is a utility class for holding four coordinates of - * a rectangle - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ -public class Rectangle -{ - public function Rectangle(x:Number = 0, y:Number = 0, width:Number = 0, height:Number = 0) - { - this.x = x; - this.y = y; - this.width = width; - this.height = height; - } - - public var x:Number; - public var y:Number; - public var width:Number; - public var height:Number; - - public function get left():Number - { - return x; - } - public function set left(value:Number):void - { - x = value; - } - public function get top():Number - { - return y; - } - public function set top(value:Number):void - { - y = value; - } - public function get right():Number - { - return x + width; - } - public function set right(value:Number):void - { - width = value - x; - } - - public function get bottom():Number - { - return y + height; - } - public function set bottom(value:Number):void - { - height = value - y; - } - public function clone():Rectangle - { - return new Rectangle(x,y,width,height); - } - public function get topLeft():Point - { - return new Point(x, y); - } - - public function set topLeft(value:Point):void - { - width = width + (x - value.x); - height = height + (y - value.y); - x = value.x; - y = value.y; - } - - public function get bottomRight():Point - { - return new Point(right, bottom); - } - - public function set bottomRight(value:Point):void - { - width = value.x - x; - height = value.y - y; - } - - public function get size():Point - { - return new Point(width, height); - } - - public function set size(value:Point):void - { - width = value.x; - height = value.y; - } - - public function isEmpty():Boolean - { - return width <= 0 || height <= 0; - } - - public function setEmpty():void + /** + * The Rectangle class is a utility class for holding four coordinates of + * a rectangle + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class Rectangle { - x = 0; - y = 0; - width = 0; - height = 0; - } - - public function inflate(dx:Number, dy:Number):void - { - x = x - dx; - width = width + 2 * dx; - y = y - dy; - height = height + 2 * dy; - } - - public function inflatePoint(point:Point):void - { - x = x - point.x; - width = width + 2 * point.x; - y = y - point.y; - height = height + 2 * point.y; - } - - public function offset(dx:Number, dy:Number):void - { - x = x + dx; - y = y + dy; - } - - public function offsetPoint(point:Point):void - { - x = x + point.x; - y = y + point.y; - } - - public function contains(x:Number, y:Number):Boolean - { - return x >= x && x < x + width && y >= y && y < y + height; - } - - public function containsPoint(point:Point):Boolean - { - return point.x >= x && point.x < x + width && point.y >= y && point.y < y + height; - } - - public function containsRect(rect:Rectangle):Boolean - { - var r1:Number = rect.x + rect.width; - var b1:Number = rect.y + rect.height; - var r2:Number = x + width; - var b2:Number = y + height; - return rect.x >= x && rect.x < r2 && rect.y >= y && rect.y < b2 && r1 > x && r1 <= r2 && b1 > y && b1 <= b2; - } - - public function intersection(toIntersect:Rectangle):Rectangle - { - var result:Rectangle = new Rectangle(); - if (isEmpty() || toIntersect.isEmpty()) + public function Rectangle(x:Number = 0, y:Number = 0, width:Number = 0, height:Number = 0) + { + this.x = x; + this.y = y; + this.width = width; + this.height = height; + } + + public var x:Number; + public var y:Number; + public var width:Number; + public var height:Number; + + public function get left():Number + { + return x; + } + public function set left(value:Number):void + { + x = value; + } + public function get top():Number + { + return y; + } + public function set top(value:Number):void + { + y = value; + } + public function get right():Number + { + return x + width; + } + public function set right(value:Number):void + { + width = value - x; + } + + public function get bottom():Number + { + return y + height; + } + public function set bottom(value:Number):void + { + height = value - y; + } + public function clone():Rectangle + { + return new Rectangle(x,y,width,height); + } + public function get topLeft():Point + { + return new Point(x, y); + } + + public function set topLeft(value:Point):void + { + width = width + (x - value.x); + height = height + (y - value.y); + x = value.x; + y = value.y; + } + + public function get bottomRight():Point + { + return new Point(right, bottom); + } + + public function set bottomRight(value:Point):void + { + width = value.x - x; + height = value.y - y; + } + + public function get size():Point + { + return new Point(width, height); + } + + public function set size(value:Point):void + { + width = value.x; + height = value.y; + } + + public function isEmpty():Boolean + { + return width <= 0 || height <= 0; + } + + public function setEmpty():void + { + x = 0; + y = 0; + width = 0; + height = 0; + } + + public function inflate(dx:Number, dy:Number):void + { + x = x - dx; + width = width + 2 * dx; + y = y - dy; + height = height + 2 * dy; + } + + public function inflatePoint(point:Point):void + { + x = x - point.x; + width = width + 2 * point.x; + y = y - point.y; + height = height + 2 * point.y; + } + + public function offset(dx:Number, dy:Number):void + { + x = x + dx; + y = y + dy; + } + + public function offsetPoint(point:Point):void + { + x = x + point.x; + y = y + point.y; + } + + public function contains(x:Number, y:Number):Boolean + { + return x >= x && x < x + width && y >= y && y < y + height; + } + + public function containsPoint(point:Point):Boolean + { + return point.x >= x && point.x < x + width && point.y >= y && point.y < y + height; + } + + public function containsRect(rect:Rectangle):Boolean { - result.setEmpty(); + var r1:Number = rect.x + rect.width; + var b1:Number = rect.y + rect.height; + var r2:Number = x + width; + var b2:Number = y + height; + return rect.x >= x && rect.x < r2 && rect.y >= y && rect.y < b2 && r1 > x && r1 <= r2 && b1 > y && b1 <= b2; + } + + public function intersection(toIntersect:Rectangle):Rectangle + { + var result:Rectangle = new Rectangle(); + if (isEmpty() || toIntersect.isEmpty()) + { + result.setEmpty(); + return result; + } + result.x = Math.max(x, toIntersect.x); + result.y = Math.max(y, toIntersect.y); + result.width = Math.min(x + width, toIntersect.x + toIntersect.width) - result.x; + result.height = Math.min(y + height, toIntersect.y + toIntersect.height) - result.y; + if (result.width <= 0 || result.height <= 0) + { + result.setEmpty(); + } return result; } - result.x = Math.max(x, toIntersect.x); - result.y = Math.max(y, toIntersect.y); - result.width = Math.min(x + width, toIntersect.x + toIntersect.width) - result.x; - result.height = Math.min(y + height, toIntersect.y + toIntersect.height) - result.y; - if (result.width <= 0 || result.height <= 0) + + public function intersects(toIntersect:Rectangle):Boolean { - result.setEmpty(); + if (isEmpty() || toIntersect.isEmpty()) + { + return false; + } + var resultx:Number = Math.max(x, toIntersect.x); + var resulty:Number = Math.max(y, toIntersect.y); + var resultwidth:Number = Math.min(x + width, toIntersect.x + toIntersect.width) - resultx; + var resultheight:Number = Math.min(y + height, toIntersect.y + toIntersect.height) - resulty; + if (resultwidth <= 0 || resultheight <= 0) + { + return false; + } + return true; } - return result; - } - - public function intersects(toIntersect:Rectangle):Boolean - { - if (isEmpty() || toIntersect.isEmpty()) + + public function union(toUnion:Rectangle):Rectangle { - return false; + var r:Rectangle = null; + if (isEmpty()) + { + return toUnion.clone(); + } + if (toUnion.isEmpty()) + { + return clone(); + } + r = new Rectangle(); + r.x = Math.min(x, toUnion.x); + r.y = Math.min(y, toUnion.y); + r.width = Math.max(x + width, toUnion.x + toUnion.width) - r.x; + r.height = Math.max(y + height, toUnion.y + toUnion.height) - r.y; + return r; } - var resultx:Number = Math.max(x, toIntersect.x); - var resulty:Number = Math.max(y, toIntersect.y); - var resultwidth:Number = Math.min(x + width, toIntersect.x + toIntersect.width) - resultx; - var resultheight:Number = Math.min(y + height, toIntersect.y + toIntersect.height) - resulty; - if (resultwidth <= 0 || resultheight <= 0) + + public function equals(toCompare:Rectangle):Boolean { - return false; + return toCompare.x == x && toCompare.y == y && toCompare.width == width && toCompare.height == height; } - return true; - } - - public function union(toUnion:Rectangle):Rectangle - { - var r:Rectangle = null; - if (isEmpty()) + + public function toString():String { - return toUnion.clone(); + return "(x=" + x + ", y=" + y + ", w=" + width + ", h=" + height + ")"; } - if (toUnion.isEmpty()) + + public function copyFrom(sourceRect:Rectangle):void { - return clone(); + x = sourceRect.x; + y = sourceRect.y; + width = sourceRect.width; + height = sourceRect.height; + } + + public function setTo(xa:Number, ya:Number, widtha:Number, heighta:Number):void + { + x = xa; + y = ya; + width = widtha; + height = heighta; + } + + public static function fromJSONString(str:String):Rectangle + { + var obj:Object = JSON.parse(str); + return Rectangle.fromObject(obj); + } + + public static function fromObject(obj:Object):Rectangle + { + var x:Number = obj.x === undefined ? obj.left : obj.x; + var y:Number = obj.y === undefined ? obj.top : obj.y; + var width:Number = obj.width === undefined ? obj.right - x : obj.width; + var height:Number = obj.height === undefined ? obj.bottom - y : obj.height; + return new Rectangle(x,y,width,height); } - r = new Rectangle(); - r.x = Math.min(x, toUnion.x); - r.y = Math.min(y, toUnion.y); - r.width = Math.max(x + width, toUnion.x + toUnion.width) - r.x; - r.height = Math.max(y + height, toUnion.y + toUnion.height) - r.y; - return r; - } - - public function equals(toCompare:Rectangle):Boolean - { - return toCompare.x == x && toCompare.y == y && toCompare.width == width && toCompare.height == height; - } - - public function toString():String - { - return "(x=" + x + ", y=" + y + ", w=" + width + ", h=" + height + ")"; - } - - public function copyFrom(sourceRect:Rectangle):void - { - x = sourceRect.x; - y = sourceRect.y; - width = sourceRect.width; - height = sourceRect.height; - } - - public function setTo(xa:Number, ya:Number, widtha:Number, heighta:Number):void - { - x = xa; - y = ya; - width = widtha; - height = heighta; } -} } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as new file mode 100644 index 0000000..1b983dc --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as @@ -0,0 +1,130 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +//////////////////////////////////////////////////////////////////////////////// +package org.apache.flex.utils +{ + import org.apache.flex.core.IUIBase; + import org.apache.flex.geom.Rectangle + /** + * The SpriteUtils class is a collection of static functions that are useful + * for geometric operations on visible objects. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.7 + */ + public class DisplayUtils + { + + /** + * Evaluates the bounding box of two objects to see if thier bounding boxes overlap. + * + * @param x The x coordinate to test against this object. + * @param y The y coordinate to test against this object. + * @param obj The object to test. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * @flexjsignorecoercion HTMLElement + */ + public static function objectsOverlap(obj1:IUIBase,obj2:IUIBase):Boolean + { + COMPILE::SWF + { + return obj1.$displayObject.hitTestObject(obj2.$displayObject); + } + + COMPILE::JS + { + var r1:Object = obj1.element.getBoundingClientRect(); + var r2:Object = obj2.element.getBoundingClientRect(); + var bounds1:Rectangle = new Rectangle(r1.x, r1.y, r1.width, r1.height); + var bounds2:Rectangle = new Rectangle(r2.x, r2.y, r2.width, r2.height); + + return bounds1.intersects(bounds2); + } + } + + /** + * Evaluates the object to see if it overlaps or intersects with + * the point specified by the x and y parameters. + * The x and y parameters specify a point in the top level coordinate space, + * not the container that contains the object being tested (unless parent is the top level). + * + * @param x The x coordinate to test against this object. + * @param y The y coordinate to test against this object. + * @param obj The object to test. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * @flexjsignorecoercion HTMLElement + */ + public static function hitTestPoint(x:Number, y:Number, obj:IUIBase):Boolean + { + COMPILE::SWF + { + return obj.$displayObject.hitTestPoint(x,y,true); + } + + COMPILE::JS + { + var result:Array = examineElementsUnderPoint(x,y,obj.element); + return result.length > 0; + } + } + COMPILE::JS + private static function examineElementsUnderPoint(x:Number, y:Number,elem:Element=null):Array + { + var element:Element; + var elements:Array = []; + var visibility:Array = []; + var found:Element; + while (true) { + element = document.elementFromPoint(x, y); + if (!element || element === document.documentElement) { + break; + } + elements[elements.length] = element; + if(elem && elem == element) + { + found = element; + break; + } + visibility[visibility.length] = element.style.visibility; + element.style.visibility = 'hidden'; // Temporarily hide the element (without changing the layout) + } + for (var i:int = 0; i < elements.length; i++) { + elements[i].style.visibility = visibility[i]; + } + if(elem) + return found ? [found] : []; + + elements.reverse(); + return elements; + } + + } + +} + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as index 95d3401..8eff640 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as @@ -21,6 +21,7 @@ package org.apache.flex.flat.beads import flash.display.Shape; import flash.display.SimpleButton; import flash.display.Sprite; + import flash.text.TextField; import flash.text.TextFieldAutoSize; import flash.text.TextFieldType; @@ -94,6 +95,7 @@ package org.apache.flex.flat.beads private var overAndSelectedSprite:Sprite; private var sprites:Array = []; + private var textFields:Array = []; private var _toggleButtonModel:IToggleButtonModel; @@ -122,6 +124,7 @@ package org.apache.flex.flat.beads this[p] = s; var tf:CSSTextField = new CSSTextField(); + textFields[textFields.length] = tf; tf.type = TextFieldType.DYNAMIC; tf.autoSize = TextFieldAutoSize.LEFT; tf.name = "textField"; @@ -129,8 +132,8 @@ package org.apache.flex.flat.beads var icon:StyleableCSSTextField = new StyleableCSSTextField(); icon.name = "icon"; icon.className = className + suffixMap[p]; - s.addChild(icon.textField); - s.addChild(tf.textField); + s.addChild(icon.$textField); + s.addChild(tf.$textField); } _toggleButtonModel = value.getBeadByType(IToggleButtonModel) as IToggleButtonModel; @@ -168,7 +171,7 @@ package org.apache.flex.flat.beads */ public function get text():String { - var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField; + var tf:TextField = upSprite.getChildByName('textField') as TextField; return tf.text; } @@ -179,8 +182,11 @@ package org.apache.flex.flat.beads { for each( var s:Sprite in sprites ) { - var tf:CSSTextField = s.getChildByName('textField') as CSSTextField; - tf.styleParent = _strand; + var tf:TextField = s.getChildByName('textField') as TextField; + var p:CSSTextField = getTextFieldParent(tf); + if(p) + p.styleParent = _strand; + tf.text = value; } @@ -197,7 +203,7 @@ package org.apache.flex.flat.beads */ public function get html():String { - var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField; + var tf:TextField = upSprite.getChildByName('textField') as TextField; return tf.htmlText; } @@ -208,12 +214,22 @@ package org.apache.flex.flat.beads { for each(var s:Sprite in sprites) { - var tf:CSSTextField = s.getChildByName('textField') as CSSTextField; + var tf:TextField = s.getChildByName('textField') as TextField; tf.htmlText = value; } layoutControl(); } + private function getTextFieldParent(tf:TextField):CSSTextField + { + var parent:CSSTextField; + for each(parent in textFields) + { + if(parent.$textField == tf) + return parent; + } + return null; + } private function textChangeHandler(event:Event):void { @@ -282,7 +298,7 @@ package org.apache.flex.flat.beads var s:Sprite = this[p]; var icon:StyleableCSSTextField = s.getChildByName("icon") as StyleableCSSTextField; icon.autoSize = TextFieldAutoSize.LEFT; - var tf:CSSTextField = s.getChildByName("textField") as CSSTextField; + var tf:TextField = s.getChildByName("textField") as TextField; icon.CSSParent = _strand; var content:String = ValuesManager.valuesImpl.getValue(icon, "content", "before"); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as index fd6d7ae..edd4136 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as @@ -66,9 +66,9 @@ package org.apache.flex.flat.beads downArrowShape = new CSSShape(); overArrowShape = new CSSShape(); overArrowShape.state = "hover"; - upSprite.addChild(upArrowShape.shape); - downSprite.addChild(downArrowShape.shape); - overSprite.addChild(overArrowShape.shape); + upSprite.addChild(upArrowShape.$shape); + downSprite.addChild(downArrowShape.$shape); + overSprite.addChild(overArrowShape.$shape); } private var textModel:ITextModel; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/DropDownListView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/DropDownListView.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/DropDownListView.as index 126bb0b..0b98907 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/DropDownListView.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/DropDownListView.as @@ -77,9 +77,9 @@ package org.apache.flex.flat.beads upTextField = new CSSTextField(); downTextField = new CSSTextField(); overTextField = new CSSTextField(); - upSprite.sprite.addChild(upTextField.textField); - overSprite.sprite.addChild(overTextField.textField); - downSprite.sprite.addChild(downTextField.textField); + upSprite.$sprite.addChild(upTextField.$textField); + overSprite.$sprite.addChild(overTextField.$textField); + downSprite.$sprite.addChild(downTextField.$textField); upTextField.selectable = false; upTextField.parentDrawsBackground = true; upTextField.parentHandlesPadding = true; @@ -103,9 +103,9 @@ package org.apache.flex.flat.beads overArrows.className = 'dropdown-caret'; downArrows = new CSSShape(); downArrows.className = 'dropdown-caret'; - upSprite.sprite.addChild(upArrows.shape); - overSprite.sprite.addChild(overArrows.shape); - downSprite.sprite.addChild(downArrows.shape); + upSprite.$sprite.addChild(upArrows.$shape); + overSprite.$sprite.addChild(overArrows.$shape); + downSprite.$sprite.addChild(downArrows.$shape); } @@ -134,10 +134,10 @@ package org.apache.flex.flat.beads shape.graphics.beginFill(0xCCCCCC); shape.graphics.drawRect(0, 0, 10, 10); shape.graphics.endFill(); - b.button.upState = upSprite.sprite; - b.button.downState = downSprite.sprite; - b.button.overState = overSprite.sprite; - b.button.hitTestState = shape; + b.$button.upState = upSprite.$sprite; + b.$button.downState = downSprite.$sprite; + b.$button.overState = overSprite.$sprite; + b.$button.hitTestState = shape; if (selectionModel.selectedIndex !== -1) selectionChangeHandler(null); else @@ -294,8 +294,8 @@ package org.apache.flex.flat.beads _popUpVisible = value; if (value) { - var root:Object = UIBase(_strand).sprite.root; - var host:DisplayObjectContainer = UIBase(_strand).sprite.parent; + var root:Object = UIBase(_strand).$sprite.root; + var host:DisplayObjectContainer = UIBase(_strand).$sprite.parent; while (host && !(host is IPopUpHost)) host = host.parent; if (host) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Formatters/src/main/flex/org/apache/flex/html/beads/FormatableTextInputView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/src/main/flex/org/apache/flex/html/beads/FormatableTextInputView.as b/frameworks/projects/Formatters/src/main/flex/org/apache/flex/html/beads/FormatableTextInputView.as index 36b1bf2..d176e7b 100644 --- a/frameworks/projects/Formatters/src/main/flex/org/apache/flex/html/beads/FormatableTextInputView.as +++ b/frameworks/projects/Formatters/src/main/flex/org/apache/flex/html/beads/FormatableTextInputView.as @@ -85,7 +85,7 @@ package org.apache.flex.html.beads // move the cursor to the end var l:int = this.textField.text.length; - this.textField.textField.setSelection(l,l); + this.textField.$textField.setSelection(l,l); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as b/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as index 733925d..658bfd2 100644 --- a/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as +++ b/frameworks/projects/GoogleMaps/src/main/flex/org/apache/flex/maps/google/beads/GoogleMapView.as @@ -453,7 +453,7 @@ package org.apache.flex.maps.google.beads model.addEventListener("zoomChanged", handleZoomChange); model.addEventListener("currentLocationChanged", handleCurrentLocationChange); - (_strand as UIBase).sprite.addChild(_loader); + (_strand as UIBase).$sprite.addChild(_loader); var token:String = GoogleMap(_strand).token; if (token) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as index 3135a84..ffc9383 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as @@ -16,15 +16,8 @@ package org.apache.flex.graphics { import org.apache.flex.core.IUIBase; - COMPILE::SWF - { - import flash.display.Sprite; - } - public interface IGraphicShape extends IUIBase { - COMPILE::SWF - function get sprite():Sprite; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as index c48ea7d..07cc3d5 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as @@ -76,10 +76,10 @@ package org.apache.flex.svg { COMPILE::SWF { - sprite.graphics.clear(); + $sprite.graphics.clear(); applyStroke(); beginFill(new Rectangle(cx,cy,radius*2, radius*2),new Point(cx-radius,cy-radius)); - sprite.graphics.drawCircle(cx+radius,cy+radius,radius); + $sprite.graphics.drawCircle(cx+radius,cy+radius,radius); endFill(); } COMPILE::JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/CompoundGraphic.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/CompoundGraphic.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/CompoundGraphic.as index b1f5cae..43bae5c 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/CompoundGraphic.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/CompoundGraphic.as @@ -110,8 +110,8 @@ package org.apache.flex.svg { COMPILE::SWF { - sprite.graphics.clear(); - sprite.removeChildren(); + $sprite.graphics.clear(); + $sprite.removeChildren(); } COMPILE::JS { @@ -141,7 +141,7 @@ package org.apache.flex.svg { applyStroke(); beginFill(new Rectangle(x, y, width, height), new Point(x,y) ); - sprite.graphics.drawRect(x, y, width, height); + $sprite.graphics.drawRect(x, y, width, height); endFill(); } COMPILE::JS @@ -174,7 +174,7 @@ package org.apache.flex.svg beginFill(new Rectangle(x,y,width,height), new Point(x,y)); radiusX *=2; radiusY = isNaN(radiusY) ? radiusY : radiusY*2; - sprite.graphics.drawRoundRect(x,y,width,height,radiusX,radiusY); + $sprite.graphics.drawRoundRect(x,y,width,height,radiusX,radiusY); endFill(); } COMPILE::JS @@ -221,7 +221,7 @@ package org.apache.flex.svg { applyStroke(); beginFill(new Rectangle(x,y,width,height), new Point(x,y)); - sprite.graphics.drawEllipse(x,y,width,height); + $sprite.graphics.drawEllipse(x,y,width,height); endFill(); } COMPILE::JS @@ -258,7 +258,7 @@ package org.apache.flex.svg { applyStroke(); beginFill(new Rectangle(x,y,radius*2, radius*2),new Point(x-radius,y-radius)); - sprite.graphics.drawCircle(x,y,radius); + $sprite.graphics.drawCircle(x,y,radius); endFill(); } COMPILE::JS @@ -317,7 +317,7 @@ package org.apache.flex.svg var bounds:Rectangle = PathHelper.getBounds(data); beginFill(bounds,bounds.topLeft); var graphicsPath:GraphicsPath = PathHelper.getSegments(data); - sprite.graphics.drawPath(graphicsPath.commands, graphicsPath.data); + $sprite.graphics.drawPath(graphicsPath.commands, graphicsPath.data); endFill(); } COMPILE::JS @@ -387,7 +387,7 @@ package org.apache.flex.svg { applyStroke(); beginFill(new Rectangle(x,y,width,height), new Point(x,y)); - sprite.graphics.drawRoundRectComplex(x,y,width,height,topLeftRadius,topRightRadius,bottomLeftRadius,bottomRightRadius); + $sprite.graphics.drawRoundRectComplex(x,y,width,height,topLeftRadius,topRightRadius,bottomLeftRadius,bottomRightRadius); endFill(); } COMPILE::JS @@ -474,7 +474,7 @@ package org.apache.flex.svg { applyStroke(); beginFill(new Rectangle(x,y,width,height), new Point(x,y)); - builder.draw(sprite.graphics); + builder.draw($sprite.graphics); endFill(); } COMPILE::JS @@ -513,7 +513,7 @@ package org.apache.flex.svg COMPILE::SWF { var textField:CSSTextField = new CSSTextField(); - sprite.addChild(textField.textField); + $sprite.addChild(textField.$textField); textField.selectable = false; textField.type = TextFieldType.DYNAMIC; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Ellipse.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Ellipse.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Ellipse.as index dbbfa0f..2cfd95e 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Ellipse.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Ellipse.as @@ -129,10 +129,10 @@ package org.apache.flex.svg { COMPILE::SWF { - sprite.graphics.clear(); + $sprite.graphics.clear(); applyStroke(); beginFill(new Rectangle(xp, yp, width, height), new Point(xp,yp)); - sprite.graphics.drawEllipse(xp,yp,width,height); + $sprite.graphics.drawEllipse(xp,yp,width,height); endFill(); } COMPILE::JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as index 27c35ad..78b8820 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as @@ -103,7 +103,7 @@ package org.apache.flex.svg { if(stroke) { - stroke.apply(sprite.graphics); + stroke.apply($sprite.graphics); } } @@ -112,7 +112,7 @@ package org.apache.flex.svg { if(fill) { - fill.begin(sprite.graphics, targetBounds,targetOrigin); + fill.begin($sprite.graphics, targetBounds,targetOrigin); } } @@ -121,7 +121,7 @@ package org.apache.flex.svg { if(fill) { - fill.end(sprite.graphics); + fill.end($sprite.graphics); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as index d25f218..3369e47 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as @@ -98,14 +98,14 @@ package org.apache.flex.svg { COMPILE::SWF { - sprite.graphics.clear(); + $sprite.graphics.clear(); applyStroke(); var bounds:Rectangle = PathHelper.getBounds(data); this.width = bounds.width; this.height = bounds.height; beginFill(bounds,new Point(bounds.left + xp, bounds.top + yp) ); var graphicsPath:GraphicsPath = PathHelper.getSegments(data,xp,yp); - sprite.graphics.drawPath(graphicsPath.commands, graphicsPath.data); + $sprite.graphics.drawPath(graphicsPath.commands, graphicsPath.data); endFill(); } COMPILE::JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as index 514317e..6888796 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as @@ -107,16 +107,16 @@ package org.apache.flex.svg { COMPILE::SWF { - sprite.graphics.clear(); + $sprite.graphics.clear(); applyStroke(); beginFill(new Rectangle(xp, yp, width, height), new Point(xp,yp)); if(isNaN(rx)) - sprite.graphics.drawRect(x, y, width, height); + $sprite.graphics.drawRect(x, y, width, height); else { var dx:Number = rx*2; var dy:Number = isNaN(ry) ? ry : ry*2; - sprite.graphics.drawRoundRect(x, y, width, height,dx ,dy); + $sprite.graphics.drawRoundRect(x, y, width, height,dx ,dy); } endFill(); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as index bdcba70..31d4477 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as @@ -59,7 +59,7 @@ package org.apache.flex.svg COMPILE::SWF { _textField = new CSSTextField(); - sprite.addChild(_textField.textField); + $sprite.addChild(_textField.$textField); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as index 93efa84..ade2671 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as @@ -142,7 +142,7 @@ package org.apache.flex.html.accessories textField.maxChars = maxChars; // listen for changes to this textField and prevent non-numeric values, such // as 34.09.94 - textField.textField.addEventListener(TextEvent.TEXT_INPUT, handleTextInput); + textField.$textField.addEventListener(TextEvent.TEXT_INPUT, handleTextInput); } else { throw new Error("NumericOnlyTextInputBead requires strand to have an ITextFieldView bead"); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as index 1c8039e..28d70e5 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as @@ -135,11 +135,11 @@ package org.apache.flex.html.accessories var model:Object = UIBase(_strand).model; if (model.text != null && model.text.length > 0 ) { - if (promptAdded) UIBase(_strand).sprite.removeChild(promptField.textField); + if (promptAdded) UIBase(_strand).$sprite.removeChild(promptField.$textField); promptAdded = false; } else { - if (!promptAdded) UIBase(_strand).sprite.addChild(promptField.textField); + if (!promptAdded) UIBase(_strand).$sprite.addChild(promptField.$textField); promptField.text = prompt; promptAdded = true; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as index 71dce2c..a4f73e2 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/BackgroundImageBead.as @@ -89,12 +89,12 @@ package org.apache.flex.html.beads loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { var host:UIBase = UIBase(_strand); if (bitmap) { - host.sprite.removeChild(bitmap); + host.$sprite.removeChild(bitmap); } bitmap = Bitmap(LoaderInfo(e.target).content); - host.sprite.addChildAt(bitmap,0); + host.$sprite.addChildAt(bitmap,0); if (isNaN(host.explicitWidth) && isNaN(host.percentWidth)) host.setWidth(loader.content.width); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as index e0104c7..f4d46a9 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as @@ -82,9 +82,9 @@ package org.apache.flex.html.beads upTextField.autoSize = "left"; downTextField.autoSize = "left"; overTextField.autoSize = "left"; - upSprite.addChild(upTextField.textField); - downSprite.addChild(downTextField.textField); - overSprite.addChild(overTextField.textField); + upSprite.addChild(upTextField.$textField); + downSprite.addChild(downTextField.$textField); + overSprite.addChild(overTextField.$textField); } private var textModel:ImageAndTextModel; @@ -148,10 +148,10 @@ package org.apache.flex.html.beads var sw:uint = IUIBase(_strand).width; var sh:uint = IUIBase(_strand).height; - textField.textField.defaultTextFormat.leftMargin = 0; - textField.textField.defaultTextFormat.rightMargin = 0; + textField.$textField.defaultTextFormat.leftMargin = 0; + textField.$textField.defaultTextFormat.rightMargin = 0; // set it again so it gets noticed - textField.textField.defaultTextFormat = textField.textField.defaultTextFormat; + textField.$textField.defaultTextFormat = textField.$textField.defaultTextFormat; var borderColor:uint; var borderThickness:uint; @@ -243,7 +243,7 @@ package org.apache.flex.html.beads { var loader:Loader = new Loader(); sprite.addChildAt(loader, 0); - sprite.addChild(textField.textField); + sprite.addChild(textField.$textField); var url:String = backgroundImage as String; loader.load(new URLRequest(url)); loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/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 0d188ed..996296c 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 @@ -82,9 +82,9 @@ package org.apache.flex.html.beads upTextField.autoSize = "left"; downTextField.autoSize = "left"; overTextField.autoSize = "left"; - upSprite.addChild(upTextField.textField); - downSprite.addChild(downTextField.textField); - overSprite.addChild(overTextField.textField); + upSprite.addChild(upTextField.$textField); + downSprite.addChild(downTextField.$textField); + overSprite.addChild(overTextField.$textField); } private var textModel:ITextModel; @@ -147,10 +147,10 @@ package org.apache.flex.html.beads var sw:uint = IUIBase(_strand).width; var sh:uint = IUIBase(_strand).height; - textField.textField.defaultTextFormat.leftMargin = 0; - textField.textField.defaultTextFormat.rightMargin = 0; + textField.$textField.defaultTextFormat.leftMargin = 0; + textField.$textField.defaultTextFormat.rightMargin = 0; // set it again so it gets noticed - textField.textField.defaultTextFormat = textField.textField.defaultTextFormat; + textField.$textField.defaultTextFormat = textField.$textField.defaultTextFormat; var borderColor:uint; var borderThickness:uint; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as index 38fb41c..c418b8a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CheckBoxView.as @@ -76,7 +76,7 @@ package org.apache.flex.html.beads var icon:Shape = new Shape(); icon.name = "icon"; s.addChild(icon); - s.addChild(tf.textField); + s.addChild(tf.$textField); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as index 64f7ecd..26cf103 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as @@ -133,10 +133,10 @@ package org.apache.flex.html.beads drawButton( downSprite, "down", 18, 18 ); button = new Button(); - button.button.upState = upSprite; - button.button.overState = overSprite; - button.button.downState = downSprite; - HTMLElementWrapper(strand).sprite.addChild(button.button); + button.$button.upState = upSprite; + button.$button.overState = overSprite; + button.$button.downState = downSprite; + HTMLElementWrapper(strand).$sprite.addChild(button.$button); button.width = 18; button.height = 18; button.x = textInput.width; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as index 2d944de..83ec293 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as @@ -67,9 +67,9 @@ package org.apache.flex.html.beads upTextField = new CSSTextField(); downTextField = new CSSTextField(); overTextField = new CSSTextField(); - upSprite.addChild(upTextField.textField); - overSprite.addChild(overTextField.textField); - downSprite.addChild(downTextField.textField); + upSprite.addChild(upTextField.$textField); + overSprite.addChild(overTextField.$textField); + downSprite.addChild(downTextField.$textField); upTextField.parentDrawsBackground = true; downTextField.parentDrawsBackground = true; overTextField.parentDrawsBackground = true; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HRuleView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HRuleView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HRuleView.as index 78d158f..b6e4990 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HRuleView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HRuleView.as @@ -78,10 +78,10 @@ package org.apache.flex.html.beads private function handleSizeChange(event:Object):void { var ui:UIBase = _strand as UIBase; - ui.sprite.graphics.clear(); - ui.sprite.graphics.beginFill(0); - ui.sprite.graphics.drawRect(0, 0, ui.width, 1); - ui.sprite.graphics.endFill(); + ui.$sprite.graphics.clear(); + ui.$sprite.graphics.beginFill(0); + ui.$sprite.graphics.drawRect(0, 0, ui.width, 1); + ui.$sprite.graphics.endFill(); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HScrollBarView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HScrollBarView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HScrollBarView.as index 67bb0db..f364935 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HScrollBarView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HScrollBarView.as @@ -91,10 +91,10 @@ package org.apache.flex.html.beads var th:Button = _thumb; th.addBead(new HScrollBarThumbView()); - v.sprite.addChild(d.button); - v.sprite.addChild(i.button); - v.sprite.addChild(tr.button); - v.sprite.addChild(th.button); + v.$sprite.addChild(d.$button); + v.$sprite.addChild(i.$button); + v.$sprite.addChild(tr.$button); + v.$sprite.addChild(th.$button); IEventDispatcher(_strand).addEventListener("widthChanged", changeHandler); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as index 339f796..f324495 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as @@ -141,7 +141,7 @@ package org.apache.flex.html.beads { var loader:Loader = new Loader(); sprite.addChildAt(loader, 0); - sprite.addChild(textField.textField); + sprite.addChild(textField.$textField); var url:String = backgroundImage as String; loader.load(new URLRequest(url)); loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as index cc68963..a956840 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageView.as @@ -131,12 +131,12 @@ package org.apache.flex.html.beads { var host:UIBase = UIBase(_strand); if (bitmap) { - host.sprite.removeChild(bitmap); + host.$sprite.removeChild(bitmap); } bitmap = Bitmap(LoaderInfo(event.target).content); - host.sprite.addChild(bitmap); + host.$sprite.addChild(bitmap); if (host.isWidthSizedToContent()) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as index 0c87a51..29a203f 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as @@ -68,7 +68,7 @@ package org.apache.flex.html.beads var icon:Shape = new Shape(); icon.name = "icon"; s.addChild(icon); - s.addChild(tf.textField); + s.addChild(tf.$textField); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as index 12eca51..03bb682 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as @@ -75,7 +75,7 @@ package org.apache.flex.html.beads private function changeHandler(event:Event):void { var host:UIBase = UIBase(_strand); - var g:Graphics = host.sprite.graphics; + var g:Graphics = host.$sprite.graphics; var w:Number = host.width; var h:Number = host.height; var state:String; @@ -85,7 +85,7 @@ package org.apache.flex.html.beads var gd:IGraphicsDrawing = _strand.getBeadByType(IGraphicsDrawing) as IGraphicsDrawing; if( this == gd ) g.clear(); - CSSBorderUtils.draw(g, w, h, host.sprite, state, false, false); + CSSBorderUtils.draw(g, w, h, host.$sprite, state, false, false); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as index eb0417b..f3a5025 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as @@ -77,8 +77,8 @@ package org.apache.flex.html.beads _thumb = new Button(); _thumb.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead); - s.sprite.addChild(_track.button); - s.sprite.addChild(_thumb.button); + s.$sprite.addChild(_track.$button); + s.$sprite.addChild(_thumb.$button); IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as index 205ec74..27c85da 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as @@ -101,8 +101,8 @@ COMPILE::JS { d.x = 0; d.y = i.height; - UIBase(_strand).sprite.addChild(d.button); - UIBase(_strand).sprite.addChild(i.button); + UIBase(_strand).$sprite.addChild(d.$button); + UIBase(_strand).$sprite.addChild(i.$button); rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel; IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as index ce795cf..e5a176f 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as @@ -124,7 +124,7 @@ package org.apache.flex.html.beads // for input, listen for changes to the _textField and update // the model - textField.addEventListener(Event.SCROLL, textScrollHandler); + textField.$textField.addEventListener(Event.SCROLL, textScrollHandler); IEventDispatcher(host).addEventListener("widthChanged", sizeChangedHandler); IEventDispatcher(host).addEventListener("heightChanged", sizeChangedHandler); @@ -153,7 +153,7 @@ package org.apache.flex.html.beads private function textScrollHandler(event:Event):void { - var tf:TextField = textField.textField; + var tf:TextField = textField.$textField; var visibleLines:int = tf.bottomScrollV - tf.scrollV + 1; var scrollableLines:int = textField.numLines - visibleLines + 1; var vsbm:ScrollBarModel = ScrollBarModel(vScrollBar.model); @@ -190,7 +190,7 @@ package org.apache.flex.html.beads private function scrollHandler(event:Event):void { var vpos:Number = IScrollBarModel(vScrollBar.model).value; - textField.textField.scrollV = vpos; + textField.$textField.scrollV = vpos; } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as index 2b5acdf..44af468 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as @@ -95,7 +95,7 @@ package org.apache.flex.html.beads override public function set strand(value:IStrand):void { super.strand = value; - var button:SimpleButton = Button(value).button; + var button:SimpleButton = Button(value).$button; textModel = value.getBeadByType(ITextModel) as ITextModel; textModel.addEventListener("textChange", textChangeHandler); textModel.addEventListener("htmlChange", htmlChangeHandler); @@ -103,9 +103,9 @@ package org.apache.flex.html.beads shape.graphics.beginFill(0xCCCCCC); shape.graphics.drawRect(0, 0, 10, 10); shape.graphics.endFill(); - button.upState = upTextField.textField; - button.downState = downTextField.textField; - button.overState = overTextField.textField; + button.upState = upTextField.$textField; + button.downState = downTextField.$textField; + button.overState = overTextField.$textField; button.hitTestState = shape; upTextField.styleParent = value; downTextField.styleParent = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as index d4eebf7..6ccbd43 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as @@ -95,7 +95,7 @@ package org.apache.flex.html.beads IEventDispatcher(_strand).addEventListener("widthChanged", widthChangeHandler); IEventDispatcher(_strand).addEventListener("heightChanged", heightChangeHandler); IEventDispatcher(_strand).addEventListener("sizeChanged", sizeChangeHandler); - UIBase(value).sprite.addChild(_textField.textField); + UIBase(value).$sprite.addChild(_textField.$textField); if (_textModel.text !== null) text = _textModel.text; if (_textModel.html !== null) @@ -277,7 +277,7 @@ package org.apache.flex.html.beads } c = input.indexOf("<span", c1); } - _textField.textField.styleSheet = ss; + _textField.$textField.styleSheet = ss; _textField.htmlText = input; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as index 901bb96..db03aab 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as @@ -78,10 +78,10 @@ package org.apache.flex.html.beads private function handleSizeChange(event:Object):void { var ui:UIBase = _strand as UIBase; - ui.sprite.graphics.clear(); - ui.sprite.graphics.beginFill(0); - ui.sprite.graphics.drawRect(0, 0, 1, ui.height); - ui.sprite.graphics.endFill(); + ui.$sprite.graphics.clear(); + ui.$sprite.graphics.beginFill(0); + ui.$sprite.graphics.drawRect(0, 0, 1, ui.height); + ui.$sprite.graphics.endFill(); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as index b807b24..dc7181b 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as @@ -88,10 +88,10 @@ package org.apache.flex.html.beads _thumb = new Button(); _thumb.addBead(new VScrollBarThumbView()); - v.sprite.addChild(_decrement.button); - v.sprite.addChild(_increment.button); - v.sprite.addChild(_track.button); - v.sprite.addChild(_thumb.button); + v.$sprite.addChild(_decrement.$button); + v.$sprite.addChild(_increment.$button); + v.$sprite.addChild(_track.$button); + v.$sprite.addChild(_thumb.$button); IEventDispatcher(_strand).addEventListener("heightChanged", changeHandler); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as index 4a8115f..25c1ce1 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as @@ -70,7 +70,7 @@ package org.apache.flex.html.beads.controllers var viewBead:ITextFieldView = _strand.getBeadByType(ITextFieldView) as ITextFieldView; textField = viewBead.textField; - textField.addEventListener("change", inputChangeHandler); + textField.$textField.addEventListener("change", inputChangeHandler); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/98822cbc/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as index da93493..236b077 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.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); thumbDownX = event.screenX; lastThumbX = sbView.thumb.x; } @@ -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); } } }
