You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/01 03:48:03 UTC
[04/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - Merge
branch 'develop' into dual. Clean build. Now to get it to run
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as
index 2a0f798,b897012..0f12f1b
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as
@@@ -22,17 -22,17 +22,17 @@@ package org.apache.flex.html.supportCla
{
import flash.text.TextFieldAutoSize;
import flash.text.TextFieldType;
--
-- import org.apache.flex.core.CSSTextField;
++
++ import org.apache.flex.core.CSSTextField;
}
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
-- import org.apache.flex.html.beads.controllers.ItemRendererMouseController;
++ import org.apache.flex.html.beads.controllers.ItemRendererMouseController;
}
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.ITextItemRenderer;
--
++
/**
* The StringItemRenderer class displays data in string form using the data's toString()
* function.
@@@ -55,20 -55,20 +55,20 @@@
public function StringItemRenderer()
{
super();
--
++
COMPILE::SWF
{
textField = new CSSTextField();
textField.type = TextFieldType.DYNAMIC;
textField.autoSize = TextFieldAutoSize.LEFT;
textField.selectable = false;
-- textField.parentDrawsBackground = true;
++ textField.parentDrawsBackground = true;
}
}
--
++
COMPILE::SWF
public var textField:CSSTextField;
--
++
/**
* @private
*/
@@@ -76,12 -76,12 +76,12 @@@
override public function addedToParent():void
{
super.addedToParent();
--
++
addChild(textField);
adjustSize();
}
--
++
/**
* @private
*/
@@@ -89,14 -89,14 +89,14 @@@
override public function adjustSize():void
{
var cy:Number = height/2;
--
++
textField.x = 0;
textField.y = cy - textField.height/2;
textField.width = width;
--
++
updateRenderer();
}
--
++
/**
* The text currently displayed by the itemRenderer instance.
*
@@@ -109,29 -109,29 +109,29 @@@
{
COMPILE::SWF
{
-- return textField.text;
++ return textField.text;
}
COMPILE::JS
{
return this.element.innerHTML;
}
}
--
++
public function set text(value:String):void
{
COMPILE::SWF
{
-- textField.text = value;
++ textField.text = value;
}
COMPILE::JS
{
this.element.innerHTML = value;
}
}
--
++
/**
* Sets the data value and uses the String version of the data for display.
-- *
++ *
* @param Object data The object being displayed by the itemRenderer instance.
*
* @langversion 3.0
@@@ -146,33 -146,33 +146,33 @@@
if (labelField) text = String(value[labelField]);
else if (dataField) text = String(value[dataField]);
else text = String(value);
--
++
this.text = text;
}
--
++
COMPILE::JS
private var controller:ItemRendererMouseController;
--
++
COMPILE::JS
private var backgroundView:WrappedHTMLElement;
--
++
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
*/
COMPILE::JS
override protected function createElement():WrappedHTMLElement
-- {
- element = document.createElement('div') as WrappedHTMLElement;
++ {
+ element = document.createElement('span') as WrappedHTMLElement;
positioner = element;
-- positioner.style.position = 'relative';
--
++ //positioner.style.position = 'relative';
++
element.flexjs_wrapper = this;
className = 'StringItemRenderer';
--
++
// itemRenderers should provide something for the background to handle
// the selection and highlight
backgroundView = element;
--
++
return element;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
index 285282a,285282a..a7ff82b
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
@@@ -32,10 -32,10 +32,15 @@@ package org.apache.flex.html.supportCla
import org.apache.flex.geom.Size;
import org.apache.flex.html.beads.models.ScrollBarModel;
import org.apache.flex.utils.CSSContainerUtils;
++ COMPILE::SWF
++ {
++ import flash.geom.Rectangle;
++ }
/**
* A Viewport is the area of a Container set aside for displaying
-- * content and any scrolling controls.
++ * content. If the content exceeds the visible area of the viewport
++ * it will be clipped or hidden.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@@ -76,6 -76,6 +81,7 @@@
/**
* @flexjsignorecoercion Class
*/
++ COMPILE::SWF
public function set strand(value:IStrand):void
{
_strand = value;
@@@ -84,8 -84,8 +90,37 @@@
{
var c:Class = ValuesManager.valuesImpl.getValue(_strand, 'iContentView') as Class;
contentArea = new c() as UIBase;
++ _strand.addBead(contentArea as IBead);
}
}
++
++ /**
++ * @flexjsignorecoercion Class
++ */
++ COMPILE::JS
++ public function set strand(value:IStrand):void
++ {
++ _strand = value;
++
++ contentArea = _strand.getBeadByType(IContentView) as UIBase;
++ if (!contentArea)
++ {
++ var c:Class = ValuesManager.valuesImpl.getValue(_strand, 'iContentView') as Class;
++ if (c != null) {
++ var result:Object = new c();
++ if (result != null) {
++ contentArea = result as UIBase;
++ _strand.addBead(contentArea as IBead);
++ }
++ }
++ }
++
++ if (contentArea == null) {
++ contentArea = value as UIBase;
++ }
++
++ contentArea.element.style.overflow = "hidden";
++ }
/**
* @copy org.apache.flex.core.IViewport#setPosition()
@@@ -97,8 -97,8 +132,10 @@@
*/
public function setPosition(x:Number, y:Number):void
{
-- contentArea.x = x;
-- contentArea.y = y;
++ COMPILE::SWF {
++ contentArea.x = x;
++ contentArea.y = y;
++ }
}
/**
@@@ -111,10 -111,10 +148,12 @@@
*/
public function layoutViewportBeforeContentLayout(width:Number, height:Number):void
{
++ COMPILE::SWF {
if (!isNaN(width))
contentArea.width = width;
if (!isNaN(height))
contentArea.height = height;
++ }
}
/**
@@@ -125,26 -125,26 +164,17 @@@
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
-- public function layoutViewportAfterContentLayout():Size
++ public function layoutViewportAfterContentLayout(contentSize:Size):void
{
-- // pass through all of the children and determine the maxWidth and maxHeight
-- // note: this is not done on the JavaScript side because the browser handles
-- // this automatically.
-- var maxWidth:Number = 0;
-- var maxHeight:Number = 0;
-- var num:Number = contentArea.numElements;
--
-- for (var i:int=0; i < num; i++) {
-- var child:IUIBase = contentArea.getElementAt(i) as IUIBase;
-- if (child == null || !child.visible) continue;
-- var childXMax:Number = child.x + child.width;
-- var childYMax:Number = child.y + child.height;
-- maxWidth = Math.max(maxWidth, childXMax);
-- maxHeight = Math.max(maxHeight, childYMax);
-- }
--
-- var padding:Rectangle = CSSContainerUtils.getPaddingMetrics(this._strand);
-- return new Size(maxWidth + padding.right, maxHeight + padding.bottom);
++ COMPILE::SWF {
++ var hostWidth:Number = UIBase(_strand).width;
++ var hostHeight:Number = UIBase(_strand).height;
++
++ var rect:flash.geom.Rectangle = new flash.geom.Rectangle(0, 0, hostWidth, hostHeight);
++ contentArea.scrollRect = rect;
++
++ return;
++ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
index 586bbfd,f76b5c8..8f9ae16
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
@@@ -15,9 -15,9 +15,11 @@@
package org.apache.flex.svg
{
import org.apache.flex.graphics.ICircle;
++ import org.apache.flex.graphics.IDrawable;
COMPILE::SWF
{
++ import flash.display.Graphics;
import flash.geom.Point;
import flash.geom.Rectangle;
}
@@@ -26,7 -26,7 +28,7 @@@
import org.apache.flex.core.WrappedHTMLElement;
}
-- public class Circle extends GraphicShape implements ICircle
++ public class Circle extends GraphicShape implements ICircle, IDrawable
{
/**
* constructor.
@@@ -78,7 -78,7 +80,7 @@@
graphics.clear();
applyStroke();
beginFill(new Rectangle(cx,cy,radius*2, radius*2),new Point(cx-radius,cy-radius));
-- graphics.drawCircle(cx,cy,radius);
++ graphics.drawCircle(cx+radius,cy+radius,radius);
endFill();
}
COMPILE::JS
@@@ -109,10 -109,10 +111,15 @@@
}
}
-- override protected function draw():void
++ override protected function drawImpl():void
{
drawCircle(0, 0, radius);
}
++
++ public function draw():void
++ {
++ drawImpl();
++ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as
index d341cba,d341cba..c7ee326
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as
@@@ -46,7 -46,7 +46,7 @@@ package org.apache.flex.sv
element.style.top = "0px";
//element.offsetParent = null;
positioner = element;
-- positioner.style.position = 'relative';
++ //positioner.style.position = 'relative';
return element;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Ellipse.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Ellipse.as
index 2fb80bd,c2fbabc..b118d30
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Ellipse.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Ellipse.as
@@@ -18,6 -18,6 +18,7 @@@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.svg
{
++ import org.apache.flex.graphics.IDrawable;
import org.apache.flex.graphics.IEllipse;
COMPILE::SWF
@@@ -30,7 -30,7 +31,7 @@@
import org.apache.flex.core.WrappedHTMLElement;
}
-- public class Ellipse extends GraphicShape implements IEllipse
++ public class Ellipse extends GraphicShape implements IEllipse, IDrawable
{
/**
* constructor.
@@@ -68,7 -68,7 +69,7 @@@
_rx = value;
}
-- private var _ry:Number;
++ private var _ry:Number;
/**
* The vertical radius of the ellipse.
@@@ -88,27 -88,7 +89,26 @@@
_ry = value;
}
+ override public function get width():Number
+ {
+ return _rx*2;
+ }
-
++
+ override public function set width(value:Number):void
+ {
+ _rx = value/2;
+ }
-
++
+ override public function get height():Number
+ {
+ return _ry*2;
+ }
-
++
+ override public function set height(value:Number):void
+ {
+ _ry = value/2;
+ }
-
COMPILE::JS
private var _ellipse:WrappedHTMLElement;
@@@ -116,8 -96,8 +116,6 @@@
* Draw the ellipse.
* @param xp The x position of the top-left corner of the bounding box of the ellipse.
* @param yp The y position of the top-left corner of the bounding box of the ellipse.
-- * @param width The width of the ellipse.
-- * @param height The height of the ellipse.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@@ -163,10 -143,10 +161,15 @@@
}
}
-- override protected function draw():void
++ override protected function drawImpl():void
{
-- drawEllipse(0, 0);
++ drawEllipse(0, 0);
}
++
++ public function draw():void
++ {
++ drawImpl();
++ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
index 37955f4,8e8498f..8bd841f
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
@@@ -14,6 -14,6 +14,7 @@@
package org.apache.flex.svg
{
import org.apache.flex.core.ContainerBase;
++ import org.apache.flex.core.IChild;
import org.apache.flex.core.IFlexJSElement;
import org.apache.flex.core.ITransformHost;
@@@ -21,7 -21,7 +22,6 @@@
{
import org.apache.flex.core.IContainer;
import org.apache.flex.core.UIBase;
-- import org.apache.flex.core.IChild;
}
[DefaultProperty("mxmlContent")]
@@@ -35,44 -35,39 +35,44 @@@
}
}
--
++
COMPILE::JS
- public class GraphicContainer extends UIBase implements ITransformHost, IContainer
- public class GraphicContainer extends UIBase implements IContainer
++ public class GraphicContainer extends ContainerBase implements ITransformHost
{
private var graphicGroup:ContainerBase;
--
++
public function GraphicContainer()
{
super();
}
--
++
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
*/
override protected function createElement():org.apache.flex.core.WrappedHTMLElement
{
element = document.createElementNS('http://www.w3.org/2000/svg', 'svg') as org.apache.flex.core.WrappedHTMLElement;
--
++
positioner = element;
--
++
// absolute positioned children need a non-null
// position value in the parent. It might
// get set to 'absolute' if the container is
// also absolutely positioned
-- positioner.style.position = 'relative';
++ //positioner.style.position = 'relative';
element.flexjs_wrapper = this;
--
++
graphicGroup = new GraphicGroup();
super.addElement(graphicGroup);
return element;
}
- COMPILE::JS
- override protected function setClassName(value:String):void
- {
- element.setAttribute('class', value);
- }
-
++ COMPILE::JS
++ override protected function setClassName(value:String):void
++ {
++ element.setAttribute('class', value);
++ }
+
override public function get transformElement():org.apache.flex.core.WrappedHTMLElement
{
return graphicGroup.element;
@@@ -80,7 -75,7 +80,7 @@@
/**
* @copy org.apache.flex.core.IParent#getElementAt()
-- *
++ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@@ -89,11 -84,11 +89,11 @@@
override public function getElementAt(index:int):IChild
{
return graphicGroup.getElementAt(index);
-- }
--
++ }
++
/**
* @copy org.apache.flex.core.IParent#addElement()
-- *
++ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@@ -105,10 -100,10 +105,10 @@@
if (dispatchEvent)
this.dispatchEvent(new Event("childrenAdded"));
}
--
++
/**
* @copy org.apache.flex.core.IParent#addElementAt()
-- *
++ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@@ -120,10 -115,10 +120,10 @@@
if (dispatchEvent)
this.dispatchEvent(new Event("childrenAdded"));
}
--
++
/**
* @copy org.apache.flex.core.IParent#removeElement()
-- *
++ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@@ -135,23 -130,23 +135,10 @@@
if (dispatchEvent)
this.dispatchEvent(new Event("childrenRemoved"));
}
--
-- /**
-- * @copy org.apache.flex.core.IContainer#childrenAdded()
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public function childrenAdded():void
-- {
-- dispatchEvent(new Event("childrenAdded"));
-- }
--
++
/**
* @copy org.apache.flex.core.IParent#getElementIndex()
-- *
++ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@@ -161,11 -156,11 +148,11 @@@
{
return graphicGroup.getElementIndex(c);
}
--
--
++
++
/**
* The number of elements in the parent.
-- *
++ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@@ -175,6 -170,6 +162,23 @@@
{
return graphicGroup.numElements;
}
++
++ COMPILE::JS
++ override public function set x(value:Number):void
++ {
++ super.x = value;
++ // Needed for SVG inside SVG
++ element.setAttribute("x", value);
++ }
++
++ COMPILE::JS
++ override public function set y(value:Number):void
++ {
++ super.y = value;
++ // Needed for SVG inside SVG
++ element.setAttribute("y", value);
++ }
++
}
}
@@@ -189,21 -184,21 +193,21 @@@ class GraphicGroup extends ContainerBas
override protected function createElement():org.apache.flex.core.WrappedHTMLElement
{
element = document.createElementNS('http://www.w3.org/2000/svg', 'g') as org.apache.flex.core.WrappedHTMLElement;
--
++
positioner = element;
--
++
// absolute positioned children need a non-null
// position value in the parent. It might
// get set to 'absolute' if the container is
// also absolutely positioned
-- positioner.style.position = 'relative';
++ //positioner.style.position = 'relative';
element.flexjs_wrapper = this;
--
++
/*addEventListener('childrenAdded',
runLayoutHandler);
addEventListener('elementRemoved',
runLayoutHandler);*/
--
++
return element;
}
--}
++}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicShape.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicShape.as
index 0d5e860,eb1acc1..523bbe3
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicShape.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicShape.as
@@@ -16,14 -16,14 +16,18 @@@ package org.apache.flex.sv
{
COMPILE::SWF
{
-- import flash.geom.Point;
-- import flash.geom.Rectangle;
++ import flash.display.Graphics;
++ import flash.display.Sprite;
++ import flash.geom.Point;
++ import flash.geom.Rectangle;
++ import org.apache.flex.core.WrappedSprite;
}
COMPILE::JS
{
import org.apache.flex.core.WrappedHTMLElement;
}
++ import org.apache.flex.core.IFlexJSElement;
import org.apache.flex.core.UIBase;
import org.apache.flex.graphics.IFill;
import org.apache.flex.graphics.IStroke;
@@@ -31,6 -31,6 +35,7 @@@
public class GraphicShape extends UIBase implements IGraphicShape
{
++
private var _fill:IFill;
private var _stroke:IStroke;
@@@ -78,7 -78,7 +83,7 @@@
{
super();
}
--
++
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
*/
@@@ -87,12 -87,12 +92,10 @@@
{
element = document.createElementNS('http://www.w3.org/2000/svg', 'svg') as WrappedHTMLElement;
element.flexjs_wrapper = this;
-- element.style.left = "0px";
-- element.style.top = "0px";
//element.offsetParent = null;
positioner = element;
-- positioner.style.position = 'relative';
--
++ //positioner.style.position = 'relative';
++
return element;
}
@@@ -127,18 -127,18 +130,15 @@@
/**
* This is where the drawing methods get called from
*/
-- protected function draw():void
++ protected function drawImpl():void
{
//Overwrite in subclass
}
override public function addedToParent():void
{
-- COMPILE::SWF
-- {
-- super.addedToParent();
-- }
-- draw();
++ super.addedToParent();
++ drawImpl();
COMPILE::JS
{
element.style.overflow = 'visible';
@@@ -175,11 -175,6 +175,12 @@@
return fillStr + ';' + strokeStr;
}
- COMPILE::JS
- override protected function setClassName(value:String):void
- {
- element.setAttribute('class', value);
- }
++ COMPILE::JS
++ override protected function setClassName(value:String):void
++ {
++ element.setAttribute('class', value);
++ }
++
/**
* @param x X position.
@@@ -195,8 -190,8 +196,14 @@@
element.style.position = 'absolute';
if (!isNaN(x)) element.style.top = x + "px";
if (!isNaN(y)) element.style.left = y + "px";
++ // element.setAttribute("width", useWidth);
++ // element.setAttribute("height", useHeight);
element.style.width = useWidth;
element.style.height = useHeight;
++ // Needed for SVG inside SVG
++ element.setAttribute("x", x);
++ element.setAttribute("y", y);
++ //Needed for SVG inside DOM elements
element.style.left = x + "px";
element.style.top = y + "px";
}
@@@ -223,6 -218,6 +230,10 @@@
_y = y;
_xOffset = xOffset;
_yOffset = yOffset;
++ // Needed for SVG inside SVG
++ element.setAttribute("x", xOffset);
++ element.setAttribute("y", yOffset);
++ //Needed for SVG inside DOM elements
element.style.left = xOffset + "px";
element.style.top = yOffset + "px";
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Image.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Image.as
index cd0729f,cd0729f..6f660ce
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Image.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Image.as
@@@ -47,7 -47,7 +47,7 @@@ package org.apache.flex.sv
element.setAttribute('y', 0);
//element.offsetParent = null;
positioner = element;
-- positioner.style.position = 'relative';
++ //positioner.style.position = 'relative';
addImageElement();
return element;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Path.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Path.as
index fe6b74a,fe6b74a..126a437
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Path.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Path.as
@@@ -14,6 -14,6 +14,7 @@@
package org.apache.flex.svg
{
++ import org.apache.flex.graphics.IDrawable;
import org.apache.flex.graphics.IPath;
import org.apache.flex.graphics.PathBuilder;
@@@ -30,7 -30,7 +31,7 @@@
}
-- public class Path extends GraphicShape implements IPath
++ public class Path extends GraphicShape implements IPath, IDrawable
{
private var _data:String;
@@@ -125,9 -125,9 +126,14 @@@
}
}
-- override protected function draw():void
++ override protected function drawImpl():void
{
drawStringPath(0, 0, data);
}
++
++ public function draw():void
++ {
++ drawImpl();
++ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Rect.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Rect.as
index 2426230,64f888d..6cacf41
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Rect.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Rect.as
@@@ -14,6 -14,6 +14,7 @@@
package org.apache.flex.svg
{
++ import org.apache.flex.graphics.IDrawable;
import org.apache.flex.graphics.IRect;
COMPILE::SWF
@@@ -26,7 -26,7 +27,7 @@@
import org.apache.flex.core.WrappedHTMLElement;
}
-- public class Rect extends GraphicShape implements IRect
++ public class Rect extends GraphicShape implements IRect, IDrawable
{
/**
* constructor.
@@@ -111,12 -111,12 +112,12 @@@
applyStroke();
beginFill(new Rectangle(xp, yp, width, height), new Point(xp,yp));
if(isNaN(rx))
-- graphics.drawRect(x, y, width, height);
++ graphics.drawRect(0, 0, width, height);
else
{
var dx:Number = rx*2;
var dy:Number = isNaN(ry) ? ry : ry*2;
-- graphics.drawRoundRect(x, y, width, height,dx ,dy);
++ graphics.drawRoundRect(0, 0, width, height,dx ,dy);
}
endFill();
}
@@@ -147,16 -147,10 +148,21 @@@
}
}
- COMPILE::JS
- override public function get transformElement():WrappedHTMLElement
- {
- return _rect;
- }
- override protected function draw():void
++ COMPILE::JS
++ override public function get transformElement():WrappedHTMLElement
++ {
++ return _rect;
++ }
+
- override protected function draw():void
++ override protected function drawImpl():void
{
drawRect(0,0,width,height);
}
++
++ public function draw():void
++ {
++ drawImpl();
++ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Text.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Text.as
index 767de41,278dcc0..7b22aab
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Text.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Text.as
@@@ -18,6 -18,6 +18,7 @@@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.svg
{
++ import org.apache.flex.graphics.IDrawable;
import org.apache.flex.graphics.IText;
import org.apache.flex.graphics.SolidColor;
@@@ -32,7 -32,7 +33,7 @@@
}
/**
-- * Draws a string of characters at a specific location using the stroke
++ * Draws a string of characters at a specific location using the fill
* value of color and alpha.
*
* @langversion 3.0
@@@ -42,7 -42,7 +43,7 @@@
* // TODO (aharui) ignore imports of external linkage interfaces?
* @flexjsignoreimport SVGLocatable
*/
-- public class Text extends GraphicShape implements IText
++ public class Text extends GraphicShape implements IText, IDrawable
{
/**
* constructor.
@@@ -59,7 -59,7 +60,7 @@@
COMPILE::SWF
{
_textField = new CSSTextField();
-- addChild(_textField);
++ addChild(_textField);
}
}
@@@ -140,11 -149,11 +150,15 @@@
}
}
-- COMPILE::JS
-- override protected function draw():void
++ override protected function drawImpl():void
{
-
- drawText(text, x, y);
++ drawText(text,x,y);
}
++ public function draw():void
++ {
++ drawImpl();
++ }
++
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 02a707d,072aed9..7dbe764
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@@ -42,9 -39,9 +41,13 @@@
<component id="List" class="org.apache.flex.html.List"/>
<component id="SimpleList" class="org.apache.flex.html.SimpleList"/>
<component id="CheckBox" class="org.apache.flex.html.CheckBox"/>
++ <component id="CSSCheckBox" class="org.apache.flex.html.CSSCheckBox"/>
<component id="RadioButton" class="org.apache.flex.html.RadioButton"/>
<component id="ComboBox" class="org.apache.flex.html.ComboBox"/>
++ <component id="ComboBoxList" class="org.apache.flex.html.supportClasses.ComboBoxList"/>
<component id="Container" class="org.apache.flex.html.Container"/>
++ <component id="Group" class="org.apache.flex.html.Group"/>
++ <component id="Accordion" class="org.apache.flex.html.Accordion"/>
<component id="Form" class="org.apache.flex.html.Form"/>
<component id="HContainer" class="org.apache.flex.html.HContainer"/>
<component id="VContainer" class="org.apache.flex.html.VContainer"/>
@@@ -61,35 -59,28 +65,41 @@@
<component id="Tree" class="org.apache.flex.html.Tree"/>
<component id="BasicLayout" class="org.apache.flex.html.beads.layouts.BasicLayout"/>
<component id="VerticalLayout" class="org.apache.flex.html.beads.layouts.VerticalLayout"/>
++ <component id="VerticalFlexLayout" class="org.apache.flex.html.beads.layouts.VerticalFlexLayout"/>
<component id="HorizontalLayout" class="org.apache.flex.html.beads.layouts.HorizontalLayout"/>
++ <component id="HorizontalFlexLayout" class="org.apache.flex.html.beads.layouts.HorizontalFlexLayout"/>
+ <component id="HorizontalFlowLayout" class="org.apache.flex.html.beads.layouts.HorizontalFlowLayout" />
<component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/>
<component id="ListView" class="org.apache.flex.html.beads.ListView"/>
+ <component id="AccordionView" class="org.apache.flex.html.beads.AccordionView"/>
- <!--<component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView"/>-->
-
++ <component id="CenterElement" class="org.apache.flex.html.beads.CenterElement"/>
+ <!--<component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView"/>-->
-
++
<component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert"/>
<component id="Alert" class="org.apache.flex.html.Alert"/>
<component id="Spinner" class="org.apache.flex.html.Spinner"/>
<component id="Slider" class="org.apache.flex.html.Slider"/>
<component id="NumericStepper" class="org.apache.flex.html.NumericStepper" />
<component id="StringItemRenderer" class="org.apache.flex.html.supportClasses.StringItemRenderer"/>
+ <component id="AccordionItemRenderer" class="org.apache.flex.html.supportClasses.AccordionItemRenderer"/>
+ <component id="AccordionCollapseBead" class="org.apache.flex.html.beads.AccordionCollapseBead"/>
++ <component id="DispatchInputFinishedBead" class="org.apache.flex.html.beads.DispatchInputFinishedBead"/>
++ <component id="DispatchKeyboardEventBead" class="org.apache.flex.html.beads.DispatchKeyboardEventBead"/>
<component id="TreeItemRenderer" class="org.apache.flex.html.supportClasses.TreeItemRenderer"/>
- <component id="MXMLItemRenderer" class="org.apache.flex.html.supportClasses.MXMLItemRenderer"/>
<component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer"/>
++ <component id="MXMLItemRenderer" class="org.apache.flex.html.supportClasses.MXMLItemRenderer"/>
<component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer"/>
+ <component id="DateItemRenderer" class="org.apache.flex.html.supportClasses.DateItemRenderer"/>
+ <component id="DayNameItemRenderer" class="org.apache.flex.html.supportClasses.DayNameItemRenderer"/>
-
<!--
<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"/>
++ <component id="HScrollBar" class="org.apache.flex.html.supportClasses.HScrollBar"/>
++ <component id="VScrollBar" class="org.apache.flex.html.supportClasses.VScrollBar"/>
<component id="HRuleView" class="org.apache.flex.html.beads.HRuleView" />
<component id="VRuleView" class="org.apache.flex.html.beads.VRuleView" />
-->
+ <component id="UnselectableElementBead" class="org.apache.flex.html.beads.UnselectableElementBead"/>
++ <component id="DisableBead" class="org.apache.flex.html.beads.DisableBead" />
<component id="NumericOnlyTextInputBead" class="org.apache.flex.html.accessories.NumericOnlyTextInputBead" />
<component id="PasswordInputBead" class="org.apache.flex.html.accessories.PasswordInputBead" />
<component id="TextPromptBead" class="org.apache.flex.html.accessories.TextPromptBead" />
@@@ -97,24 -88,23 +107,25 @@@
<component id="VRule" class="org.apache.flex.html.VRule" />
<component id="Spacer" class="org.apache.flex.html.Spacer" />
<!--
-- <component id="ImageAndTextButtonView" class="org.apache.flex.html.beads.ImageAndTextButtonView" />
++ <component id="ImageAndTextButtonView" class="org.apache.flex.html.beads.ImageAndTextButtonView" />
-->
<component id="ScrollingViewport" class="org.apache.flex.html.supportClasses.ScrollingViewport" />
-
+ <component id="ClippingViewport" class="org.apache.flex.html.supportClasses.ClippingViewport" />
-
++
<component id="ArraySelectionModel" class="org.apache.flex.html.beads.models.ArraySelectionModel" />
<component id="ArrayListSelectionModel" class="org.apache.flex.html.beads.models.ArrayListSelectionModel" />
<component id="DataGrid" class="org.apache.flex.html.DataGrid"/>
<component id="DataProviderChangeNotifier" class="org.apache.flex.html.beads.DataProviderChangeNotifier"/>
++ <component id="DataProviderCollectionChangeNotifier" class="org.apache.flex.html.beads.DataProviderCollectionChangeNotifier"/>
++ <component id="DataProviderItemsChangeNotifier" class="org.apache.flex.html.beads.DataProviderItemsChangeNotifier"/>
<component id="DataGridButtonBar" class="org.apache.flex.html.DataGridButtonBar"/>
<component id="DataGridButtonBarTextButton" class="org.apache.flex.html.DataGridButtonBarTextButton"/>
<component id="DataGridColumn" class="org.apache.flex.html.supportClasses.DataGridColumn"/>
<component id="DataGridLinesBead" class="org.apache.flex.html.beads.DataGridLinesBead"/>
<component id="DataGridColumnList" class="org.apache.flex.html.supportClasses.DataGridColumnList"/>
-- <component id="DataGridLayout" class="org.apache.flex.html.beads.layouts.DataGridLayout" />
-- <component id="DataGridPercentageLayout" class="org.apache.flex.html.beads.layouts.DataGridPercentageLayout" />
--
++ <component id="DataGridPercentageView" class="org.apache.flex.html.beads.DataGridPercentageView" />
++
<component id="DataItemRendererFactoryForArrayData" class="org.apache.flex.html.beads.DataItemRendererFactoryForArrayData" />
<component id="DataItemRendererFactoryForArrayList" class="org.apache.flex.html.beads.DataItemRendererFactoryForArrayList" />
<component id="DataItemRendererFactoryForHierarchicalData" class="org.apache.flex.html.beads.DataItemRendererFactoryForHierarchicalData" />
@@@ -122,11 -112,8 +133,10 @@@
<component id="TextItemRendererFactoryForStringVectorData" class="org.apache.flex.html.beads.TextItemRendererFactoryForStringVectorData" />
<component id="DateChooser" class="org.apache.flex.html.DateChooser"/>
+ <component id="DateChooserList" class="org.apache.flex.html.supportClasses.DateChooserList" />
+ <component id="DateChooserHeader" class="org.apache.flex.html.supportClasses.DateChooserHeader" />
<component id="DateField" class="org.apache.flex.html.DateField"/>
<component id="VerticalColumnLayout" class="org.apache.flex.html.beads.layouts.VerticalColumnLayout" />
- <component id="ComboBoxList" class="org.apache.flex.html.supportClasses.ComboBoxList" />
<component id="ToolTipBead" class="org.apache.flex.html.accessories.ToolTipBead" />
@@@ -137,10 -123,9 +147,11 @@@
<component id="OneFlexibleChildVerticalLayout" class="org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout"/>
<component id="OneFlexibleChildHorizontalLayout" class="org.apache.flex.html.beads.layouts.OneFlexibleChildHorizontalLayout"/>
<component id="MXMLBeadView" class="org.apache.flex.html.MXMLBeadView"/>
- <component id="DisableBead" class="org.apache.flex.html.beads.DisableBead"/>
+
++ <component id="SubAppLoader" class="org.apache.flex.html.SubAppLoader" />
+
<component id="Border" class="org.apache.flex.html.supportClasses.Border"/>
--
++
<component id="WebBrowser" class="org.apache.flex.html.WebBrowser" />
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/resources/defaults.css
index b27bc0b,431c564..9ecea43
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@@ -34,40 -34,15 +34,49 @@@
box-sizing: border-box;
}
+Accordion
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.AccordionView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout");
+ IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
+ IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.AccordionItemRenderer");
+ IViewport: ClassReference("org.apache.flex.html.supportClasses.ClippingViewport");
+ IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
+ IAccordionCollapseBead: ClassReference("org.apache.flex.html.beads.AccordionCollapseBead");
+ border-style: solid;
+ border-color: #222222;
+}
+
+AccordionItemRenderer
+{
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AccordionItemRendererMouseController");
+ IBeadView: ClassReference("org.apache.flex.html.beads.AccordionItemRendererView");
+}
+
+Alert
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
+
+ background-color: #FFFFFF;
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+}
+
+
+ .unselectable
+ {
+ -moz-user-select: -moz-none;
+ -khtml-user-select: none;
+ -webkit-user-select: none;
+ -o-user-select: none;
+ user-select: none;
+ }
+
Application
{
padding: 0px;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
index 53e6ffd,286f0eb..38f33f1
--- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
@@@ -60,29 -62,30 +64,54 @@@ package org.apache.flex.expres
dispatchEvent(new Event("enabledChanged"));
}
+ [Bindable("enabledChanged")]
+ /**
+ * Can enable or disable interaction with the control.
+ */
+ COMPILE::SWF
+ override public function get enabled():Boolean
+ {
+ return _enabled;
+ }
+ COMPILE::SWF
+ override public function set enabled(value:Boolean):void
+ {
+ _enabled = value;
+
+ if (_disableBead == null) {
+ _disableBead = new DisableBead();
+ addBead(_disableBead);
+ }
+
+ _disableBead.disabled = !value;
+
+ dispatchEvent(new Event("enabledChanged"));
+ }
+
+ [Bindable("toolTipChanged")]
+ /**
+ * Displays a hint when the mouse hovers over the button
+ */
+ public function get toolTip():String
+ {
+ if (_toolTipBead) {
+ return _toolTipBead.toolTip;
+ }
+ else {
+ return null;
+ }
+ }
+ public function set toolTip(value:String):void
+ {
+ _toolTipBead = getBeadByType(ToolTipBead) as ToolTipBead;
+
+ if (_toolTipBead == null) {
+ _toolTipBead = new ToolTipBead();
+ addBead(_toolTipBead);
+ }
+ _toolTipBead.toolTip = value;
+
+ dispatchEvent(new Event("toolTipChanged"));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/Graphics/build.xml
index 51c89ad,01cbeb5..08dd3bb
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/build.xml
@@@ -74,28 -74,23 +74,29 @@@
<echo message="Compiling libs/${ant.project.name}.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <compc fork="true"
- output="${basedir}/target/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
+ <jvmarg value="-Xmx384m" />
+ <jvmarg value="-Dsun.io.useCanonCaches=false" />
+ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
+ <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+ <arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-define=COMPILE::SWF,true" />
- <arg value="-define=COMPILE::JS,false" />
+ <arg value="-compiler.strict-xml=true" />
+ <arg value="-compiler.targets=SWF,JSFlex" />
+ <arg value="-output=${basedir}/target/${target.name}" />
+ <arg value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" />
+ <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" />
+ <arg value="-compiler.byte-array-embed-class=org.apache.flex.core.ByteArrayAsset" />
- </compc>
- <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+ </java>
</target>
- <target name="check-compiler" depends="check-falcon-home">
+ <target name="check-compiler" depends="check-falcon-home,check-falconjx-home">
<path id="lib.path">
- <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ <fileset dir="${FALCONJX_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Graphics/pom.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/Graphics/pom.xml
index 4689a76,4c89405..912d678
--- a/frameworks/projects/Graphics/pom.xml
+++ b/frameworks/projects/Graphics/pom.xml
@@@ -54,7 -109,7 +109,8 @@@
<includeClasses>
<includeClass>GraphicsClasses</includeClass>
</includeClasses>
+ <skipExtern>true</skipExtern>
+ <additionalCompilerOptions>-compiler.byte-array-embed-class=org.apache.flex.core.ByteArrayAsset</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Graphics/src/main/config/compile-swf-config.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/Graphics/src/main/config/compile-swf-config.xml
index 97799ad,0000000..fdbf2a6
mode 100644,000000..100644
--- a/frameworks/projects/Graphics/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/Graphics/src/main/config/compile-swf-config.xml
@@@ -1,91 -1,0 +1,92 @@@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>false</accessible>
+
+ <external-library-path>
+ <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+ <path-element>../../../../../libs/Core.swc</path-element>
+ </external-library-path>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
++ <byte-array-embed-class>org.apache.flex.core.ByteArrayAsset</byte-array-embed-class>
+
+ <define>
+ <name>COMPILE::SWF</name>
+ <value>true</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>false</value>
+ </define>
+
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>../resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/svg</uri>
+ <manifest>../resources/svg-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>../flex</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-file>
+ <name>defaults.css</name>
+ <path>../resources/defaults.css</path>
+ </include-file>
+
+ <include-classes>
+ <class>GraphicsClasses</class>
+ </include-classes>
+
+ <include-namespaces>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+ </include-namespaces>
+
+ <target-player>${playerglobal.version}</target-player>
+
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
----------------------------------------------------------------------
diff --cc frameworks/projects/HTML/src/main/flex/HTMLClasses.as
index bf64031,0e7e052..0cf5594
--- a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
+++ b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
@@@ -26,8 -26,202 +26,8 @@@ packag
* from the classes specified in manifest.xml.
*/
internal class HTMLClasses
-{
- import org.apache.flex.html.ToolTip; ToolTip;
- import org.apache.flex.html.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead;
- import org.apache.flex.html.beads.DispatchInputFinishedBead; DispatchInputFinishedBead;
- import org.apache.flex.html.accessories.PasswordInputBead; PasswordInputBead;
- import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead;
- import org.apache.flex.html.beads.AlertView; AlertView;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.BackgroundImageBead; BackgroundImageBead;
- }
- import org.apache.flex.html.beads.ButtonBarView; ButtonBarView;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.CheckBoxView; CheckBoxView;
- }
- import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
- import org.apache.flex.html.beads.ContainerView; ContainerView;
- import org.apache.flex.html.beads.GroupView; GroupView;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.ControlBarMeasurementBead; ControlBarMeasurementBead;
- import org.apache.flex.html.beads.CSSButtonView; CSSButtonView;
- import org.apache.flex.html.beads.CSSImageAndTextButtonView; CSSImageAndTextButtonView;
- import org.apache.flex.html.beads.CSSTextButtonView; CSSTextButtonView;
- import org.apache.flex.html.beads.CSSTextToggleButtonView; CSSTextToggleButtonView;
- import org.apache.flex.html.beads.DropDownListView; DropDownListView;
- import org.apache.flex.html.beads.CloseButtonView; CloseButtonView;
- import org.apache.flex.html.beads.ImageAndTextButtonView; ImageAndTextButtonView;
- }
- import org.apache.flex.html.beads.ImageView; org.apache.flex.html.beads.ImageView;
- import org.apache.flex.html.beads.BinaryImageLoader; BinaryImageLoader;
- import org.apache.flex.html.beads.models.BinaryImageModel; BinaryImageModel;
- import org.apache.flex.html.beads.ImageButtonView; ImageButtonView;
- import org.apache.flex.html.beads.ListView; ListView;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.NumericStepperView; NumericStepperView;
- }
- import org.apache.flex.html.beads.PanelView; PanelView;
- import org.apache.flex.html.supportClasses.PanelLayoutProxy; PanelLayoutProxy;
- import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView;
- import org.apache.flex.html.beads.AccordionItemRendererView; AccordionItemRendererView;
- import org.apache.flex.html.beads.SliderView; SliderView;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.RadioButtonView; RadioButtonView;
- import org.apache.flex.html.beads.VScrollBarView; VScrollBarView;
- import org.apache.flex.html.beads.HScrollBarView; HScrollBarView;
- import org.apache.flex.html.beads.ScrollBarView; ScrollBarView;
- import org.apache.flex.html.beads.SliderThumbView; SliderThumbView;
- import org.apache.flex.html.beads.SliderTrackView; SliderTrackView;
- import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView;
- import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead;
- import org.apache.flex.html.beads.SingleLineBorderWithChangeListenerBead; SingleLineBorderWithChangeListenerBead;
- }
- import org.apache.flex.html.beads.SpinnerView; SpinnerView;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.SolidBackgroundBead; SolidBackgroundBead;
- import org.apache.flex.html.beads.SolidBackgroundWithChangeListenerBead; SolidBackgroundWithChangeListenerBead;
- import org.apache.flex.html.beads.TextButtonMeasurementBead; TextButtonMeasurementBead;
- import org.apache.flex.html.beads.TextFieldLabelMeasurementBead; TextFieldLabelMeasurementBead;
- import org.apache.flex.html.beads.TextAreaView; TextAreaView;
- import org.apache.flex.html.beads.TextButtonView; TextButtonView;
- import org.apache.flex.html.beads.TextFieldView; TextFieldView;
- import org.apache.flex.html.beads.TextInputView; TextInputView;
- import org.apache.flex.html.beads.TextInputWithBorderView; TextInputWithBorderView;
- import org.apache.flex.html.beads.models.AlertModel; AlertModel;
- }
- import org.apache.flex.html.beads.models.AlertModel; AlertModel;
- import org.apache.flex.html.beads.models.ArraySelectionModel; ArraySelectionModel;
- import org.apache.flex.html.beads.models.ArrayListSelectionModel; ArrayListSelectionModel;
- import org.apache.flex.html.beads.models.RangeModel; RangeModel;
- import org.apache.flex.html.beads.models.RangeModelExtended; RangeModelExtended;
- import org.apache.flex.html.beads.models.ComboBoxModel; ComboBoxModel;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.models.ImageModel; ImageModel;
- import org.apache.flex.html.beads.models.ImageAndTextModel; ImageAndTextModel;
- }
- import org.apache.flex.html.beads.models.PanelModel; PanelModel;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.models.SingleLineBorderModel; SingleLineBorderModel;
- }
- import org.apache.flex.html.beads.models.TextModel; TextModel;
- import org.apache.flex.html.beads.models.TitleBarModel; TitleBarModel;
- import org.apache.flex.html.beads.models.ToggleButtonModel; ToggleButtonModel;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.models.ValueToggleButtonModel; ValueToggleButtonModel;
- }
- import org.apache.flex.html.beads.models.ViewportModel; ViewportModel;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.controllers.AlertController; AlertController;
- import org.apache.flex.html.beads.controllers.DropDownListController; DropDownListController;
- import org.apache.flex.html.beads.controllers.EditableTextKeyboardController; EditableTextKeyboardController;
- }
- import org.apache.flex.html.beads.controllers.ComboBoxController; ComboBoxController;
- import org.apache.flex.html.beads.controllers.AccordionItemRendererMouseController; AccordionItemRendererMouseController;
- import org.apache.flex.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController;
- import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController;
- import org.apache.flex.html.beads.controllers.TreeSingleSelectionMouseController; TreeSingleSelectionMouseController;
- import org.apache.flex.html.beads.controllers.SliderMouseController; SliderMouseController;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.controllers.SpinnerMouseController; SpinnerMouseController;
- import org.apache.flex.html.beads.controllers.VScrollBarMouseController; VScrollBarMouseController;
- import org.apache.flex.html.beads.controllers.HScrollBarMouseController; HScrollBarMouseController;
- }
- import org.apache.flex.html.beads.layouts.ButtonBarLayout; ButtonBarLayout;
- import org.apache.flex.html.beads.layouts.VerticalLayout; VerticalLayout;
- import org.apache.flex.html.beads.layouts.VerticalFlexLayout; VerticalFlexLayout;
- import org.apache.flex.html.beads.layouts.HorizontalLayout; HorizontalLayout;
- import org.apache.flex.html.beads.layouts.HorizontalFlexLayout; HorizontalFlexLayout;
- import org.apache.flex.html.beads.layouts.BasicLayout; BasicLayout;
- import org.apache.flex.html.beads.layouts.OneFlexibleChildHorizontalLayout; OneFlexibleChildHorizontalLayout;
- import org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout; OneFlexibleChildVerticalLayout;
-
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.layouts.HScrollBarLayout; HScrollBarLayout;
- import org.apache.flex.html.beads.layouts.VScrollBarLayout; VScrollBarLayout;
- import org.apache.flex.html.supportClasses.ContainerContentArea; ContainerContentArea;
- }
- import org.apache.flex.html.beads.layouts.TileLayout; TileLayout;
- import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
- import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData;
- import org.apache.flex.html.beads.DataItemRendererFactoryForArrayList; DataItemRendererFactoryForArrayList;
- import org.apache.flex.html.beads.DataItemRendererFactoryForHierarchicalData; DataItemRendererFactoryForHierarchicalData;
- import org.apache.flex.html.supportClasses.DataGroup; DataGroup;
- import org.apache.flex.html.supportClasses.Viewport; Viewport;
- import org.apache.flex.html.supportClasses.ScrollingViewport; ScrollingViewport;
- import org.apache.flex.html.supportClasses.DataGridButtonBarButtonItemRenderer; DataGridButtonBarButtonItemRenderer;
-
- import org.apache.flex.html.DataGridButtonBarTextButton; DataGridButtonBarTextButton;
- import org.apache.flex.html.DataGridButtonBar; DataGridButtonBar;
- import org.apache.flex.html.beads.DataGridColumnView; DataGridColumnView;
- import org.apache.flex.html.beads.DataGridView; DataGridView;
- import org.apache.flex.html.beads.DataGridPercentageView; DataGridPercentageView;
- import org.apache.flex.html.beads.DateChooserView; DateChooserView;
- import org.apache.flex.html.beads.DateFieldView; DateFieldView;
- import org.apache.flex.html.beads.DecrementButtonView; DecrementButtonView;
- import org.apache.flex.html.beads.IncrementButtonView; IncrementButtonView;
- import org.apache.flex.html.beads.RangeStepperView; RangeStepperView;
- import org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout; FlexibleFirstChildHorizontalLayout;
- import org.apache.flex.html.beads.models.DataGridModel; DataGridModel;
- import org.apache.flex.html.beads.models.DateChooserModel; DateChooserModel;
- import org.apache.flex.html.beads.models.DataGridPresentationModel; DataGridPresentationModel;
- import org.apache.flex.html.beads.controllers.DateChooserMouseController; DateChooserMouseController;
- import org.apache.flex.html.beads.controllers.DateFieldMouseController; DateFieldMouseController;
- import org.apache.flex.html.beads.controllers.RangeStepperMouseController; RangeStepperMouseController;
- import org.apache.flex.html.supportClasses.DataGridColumn; DataGridColumn;
- import org.apache.flex.html.supportClasses.DateChooserButton; DateChooserButton;
- import org.apache.flex.html.supportClasses.DateHeaderButton; DateHeaderButton;
- import org.apache.flex.html.supportClasses.DateItemRenderer; DateItemRenderer;
- import org.apache.flex.html.supportClasses.GraphicsItemRenderer; GraphicsItemRenderer;
- import org.apache.flex.html.supportClasses.DateChooserList; DateChooserList;
-
- import org.apache.flex.html.beads.TitleBarView; TitleBarView;
- import org.apache.flex.html.beads.TitleBarMeasurementBead; TitleBarMeasurementBead;
-
- import org.apache.flex.html.beads.WebBrowserView; WebBrowserView;
- import org.apache.flex.html.beads.models.WebBrowserModel; WebBrowserModel;
-
- import org.apache.flex.core.ListBase; ListBase;
- import org.apache.flex.core.FilledRectangle; FilledRectangle;
- import org.apache.flex.core.UIBase; UIBase;
- import org.apache.flex.core.SimpleApplication; SimpleApplication;
- import org.apache.flex.svg.GraphicContainer; GraphicContainer;
- import org.apache.flex.svg.DOMWrapper; DOMWrapper;
-
- import org.apache.flex.svg.GraphicShape; GraphicShape;
- import org.apache.flex.svg.Rect; Rect;
- import org.apache.flex.svg.Ellipse; Ellipse;
- import org.apache.flex.svg.Circle; Circle;
- import org.apache.flex.svg.Image; Image;
- import org.apache.flex.svg.BinaryImage; BinaryImage;
- import org.apache.flex.svg.beads.ImageView; org.apache.flex.svg.beads.ImageView;
- import org.apache.flex.svg.Path; Path;
- import org.apache.flex.svg.Text; Text;
- import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
-
- import org.apache.flex.html.beads.models.DataProviderModel; DataProviderModel;
- import org.apache.flex.html.beads.DataContainerView; DataContainerView;
+{
- import org.apache.flex.html.Module; Module;
+
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.HRuleView; HRuleView;
- import org.apache.flex.html.beads.VRuleView; VRuleView;
- import org.apache.flex.html.beads.MultilineTextFieldView; MultilineTextFieldView;
- }
-
- import org.apache.flex.html.SubAppLoader; SubAppLoader;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/HTML/src/main/resources/basic-manifest.xml
index 0a233ac,65f21d7..3d60024
--- a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
@@@ -42,5 -174,5 +42,6 @@@
<component id="InnerHTML" class="org.apache.flex.html.beads.InnerHTML" />
<component id="TextNode" class="org.apache.flex.html.TextNode" />
++ <component id="HTMLText" class="org.apache.flex.html.HTMLText"/>
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/MaterialDesignLite/src/main/config/compile-swf-config.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/MaterialDesignLite/src/main/config/compile-swf-config.xml
index f24bd02,0000000..c67a914
mode 100644,000000..100644
--- a/frameworks/projects/MaterialDesignLite/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/config/compile-swf-config.xml
@@@ -1,98 -1,0 +1,99 @@@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>false</accessible>
+
+ <external-library-path>
+ <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+ <path-element>../../../../../libs/Binding.swc</path-element>
+ <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../../../libs/Graphics.swc</path-element>
++ <path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/HTML.swc</path-element>
+ <path-element>../../../../../libs/Basic.swc</path-element>
+ </external-library-path>
+
+ <allow-subclass-overrides>true</allow-subclass-overrides>
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+
+ <define>
+ <name>COMPILE::SWF</name>
+ <value>true</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>false</value>
+ </define>
+
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/mdl</uri>
+ <manifest>../resources/mdl-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/mdl</uri>
+ <manifest>../resources/mdl-as-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>../flex</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-file>
+ <name>defaults.css</name>
+ <path>../resources/defaults.css</path>
+ </include-file>
+
+ <include-lookup-only>true</include-lookup-only>
+
+ <include-classes>
+ <class>MDLClasses</class>
+ </include-classes>
+
+ <include-namespaces>
+ <uri>library://ns.apache.org/flexjs/mdl</uri>
+ </include-namespaces>
+
+ <target-player>${playerglobal.version}</target-player>
+
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
----------------------------------------------------------------------