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 2015/10/08 20:51:03 UTC
[01/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
If Apache Flex event type is on the list of element events,
convert to DOM event.
Repository: flex-asjs
Updated Branches:
refs/heads/core_js_to_as 14674b2d9 -> 037c91245
If Apache Flex event type is on the list of element events, convert to DOM event.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9eade69f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9eade69f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9eade69f
Branch: refs/heads/core_js_to_as
Commit: 9eade69f055105c70dba052d4dbd6ccef24e876f
Parents: 0dfd3de
Author: Peter Ent <pe...@apache.org>
Authored: Tue Sep 8 14:34:34 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Tue Sep 8 14:34:34 2015 -0400
----------------------------------------------------------------------
.../Core/js/src/org/apache/flex/events/EventDispatcher.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9eade69f/frameworks/projects/Core/js/src/org/apache/flex/events/EventDispatcher.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/events/EventDispatcher.js b/frameworks/projects/Core/js/src/org/apache/flex/events/EventDispatcher.js
index a7a9261..0429dbd 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/events/EventDispatcher.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/events/EventDispatcher.js
@@ -81,8 +81,12 @@ org.apache.flex.events.EventDispatcher.prototype.dispatchEvent = function(e) {
if (e === 'change')
e = new Event(e);
}
- else
+ else {
t = e.type;
+ if (org.apache.flex.events.ElementEvents.elementEvents[t]) {
+ e = new Event(t);
+ }
+ }
var source = this.getActualDispatcher_(t);
if (source == this)
return org.apache.flex.events.EventDispatcher.base(this, 'dispatchEvent', e);
[28/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Fairly big change to the Container structure: removed the "chrome" concept in
favor of letting "advanced" components have access to the strand-as-parent.
Posted by ah...@apache.org.
Fairly big change to the Container structure: removed the "chrome" concept in favor of letting "advanced" components have access to the strand-as-parent.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/031ad2e7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/031ad2e7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/031ad2e7
Branch: refs/heads/core_js_to_as
Commit: 031ad2e79750fe0ea560c43d1b4b37f939bb704a
Parents: 58dee53
Author: Peter Ent <pe...@apache.org>
Authored: Fri Sep 18 14:30:53 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Sep 18 14:30:53 2015 -0400
----------------------------------------------------------------------
.../charts/beads/layouts/ChartBaseLayout.as | 4 +-
.../layouts/LineChartCategoryVsLinearLayout.as | 4 +-
.../layouts/LineChartLinearVsLinearLayout.as | 4 +-
.../flex/charts/beads/layouts/PieChartLayout.as | 4 +-
.../beads/layouts/StackedBarChartLayout.as | 4 +-
.../beads/layouts/StackedColumnChartLayout.as | 4 +-
frameworks/projects/Core/as/src/CoreClasses.as | 6 +-
.../src/org/apache/flex/core/ContainerBase.as | 207 ++++++++++---------
.../flex/core/ContainerBaseStrandChildren.as | 98 +++++++++
.../src/org/apache/flex/core/IContainerView.as | 33 +++
.../org/apache/flex/core/IContentViewHost.as | 35 ++++
.../as/src/org/apache/flex/core/ILayoutHost.as | 44 ++++
.../src/org/apache/flex/core/ILayoutParent.as | 56 -----
.../as/src/org/apache/flex/core/ListBase.as | 123 +++++++++++
.../apache/flex/core/ListBaseStrandChildren.as | 99 +++++++++
.../as/src/org/apache/flex/core/ViewBase.as | 2 -
.../src/org/apache/flex/core/ContainerBase.js | 205 ++++++++++++------
.../flex/core/ContainerBaseStrandChildren.js | 112 ++++++++++
.../src/org/apache/flex/core/IContainerView.js | 44 ++++
.../org/apache/flex/core/IContentViewHost.js | 52 +++++
.../js/src/org/apache/flex/core/ILayoutHost.js | 46 +++++
.../src/org/apache/flex/core/ILayoutParent.js | 59 ------
.../Core/js/src/org/apache/flex/core/IParent.js | 9 +-
.../js/src/org/apache/flex/core/ListBase.js | 75 ++++++-
.../apache/flex/core/ListBaseStrandChildren.js | 112 ++++++++++
.../Core/js/src/org/apache/flex/core/UIBase.js | 23 +++
frameworks/projects/Flat/flat-manifest.xml | 2 +-
.../HTML/as/src/org/apache/flex/html/List.as | 27 ++-
.../src/org/apache/flex/html/NumericStepper.as | 3 +-
.../org/apache/flex/html/beads/ButtonBarView.as | 1 -
.../org/apache/flex/html/beads/ContainerView.as | 58 +++++-
.../src/org/apache/flex/html/beads/ListView.as | 1 -
.../flex/html/beads/NumericStepperView.as | 7 +-
.../src/org/apache/flex/html/beads/PanelView.as | 3 +-
.../flex/html/beads/PanelWithControlBarView.as | 5 +-
.../flex/html/beads/layouts/BasicLayout.as | 4 +-
.../flex/html/beads/layouts/ButtonBarLayout.as | 4 +-
.../flex/html/beads/layouts/HorizontalLayout.as | 4 +-
.../flex/html/beads/layouts/TileLayout.as | 4 +-
.../flex/html/beads/layouts/VerticalLayout.as | 4 +-
.../html/supportClasses/ScrollingViewport.as | 5 +-
.../org/apache/flex/html/MXMLBeadViewBase.as | 4 +-
.../FlexibleFirstChildHorizontalLayout.as | 4 +-
.../layouts/OneFlexibleChildHorizontalLayout.as | 4 +-
.../layouts/OneFlexibleChildVerticalLayout.as | 4 +-
.../html/beads/layouts/VerticalColumnLayout.as | 4 +-
frameworks/projects/HTML/basic-manifest.xml | 2 +-
.../HTML/js/src/org/apache/flex/html/List.js | 3 +
.../src/org/apache/flex/html/NumericStepper.js | 1 +
.../org/apache/flex/html/beads/ContainerView.js | 74 ++++++-
.../src/org/apache/flex/html/beads/PanelView.js | 2 +-
.../flex/html/beads/layouts/BasicLayout.js | 3 +-
.../flex/html/beads/layouts/ButtonBarLayout.js | 3 +-
.../flex/html/beads/layouts/HorizontalLayout.js | 3 +-
.../flex/html/beads/layouts/TileLayout.js | 4 +-
.../flex/html/beads/layouts/VerticalLayout.js | 3 +-
56 files changed, 1366 insertions(+), 348 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
index 3f2fd27..88dd0a4 100644
--- a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
+++ b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/ChartBaseLayout.as
@@ -23,7 +23,7 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.core.IHorizontalAxisBead;
import org.apache.flex.charts.core.IVerticalAxisBead;
import org.apache.flex.core.IBeadLayout;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IStrand;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -116,7 +116,7 @@ package org.apache.flex.charts.beads.layouts
public function get chartDataGroup():IChartDataGroup
{
if (_chartDataGroup == null) {
- var layoutParent:ILayoutParent = chart.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = chart.getBeadByType(ILayoutHost) as ILayoutHost;
_chartDataGroup = layoutParent.contentView as IChartDataGroup;
}
return _chartDataGroup;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
index 77b9fd6..b28ace9 100644
--- a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
+++ b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
@@ -25,7 +25,7 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.supportClasses.LineSeries;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
@@ -56,7 +56,7 @@ package org.apache.flex.charts.beads.layouts
if (!dp)
return;
- var layoutParent:ILayoutParent = strand.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var n:int = dp.length;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
index 8088a6a..a001bfa 100644
--- a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
+++ b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
@@ -25,7 +25,7 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.supportClasses.LineSeries;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
@@ -56,7 +56,7 @@ package org.apache.flex.charts.beads.layouts
if (!dp)
return;
- var layoutParent:ILayoutParent = strand.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var n:int = dp.length;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
index 22e4145..901da7f 100644
--- a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
+++ b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
@@ -24,7 +24,7 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.supportClasses.PieSeries;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.graphics.IFill;
import org.apache.flex.core.graphics.SolidColor;
@@ -64,7 +64,7 @@ package org.apache.flex.charts.beads.layouts
if (!dp)
return;
- var layoutParent:ILayoutParent = strand.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var n:int = dp.length;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
index 705d5d8..c75f7bc 100644
--- a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
+++ b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
@@ -24,7 +24,7 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.supportClasses.BarSeries;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
@@ -84,7 +84,7 @@ package org.apache.flex.charts.beads.layouts
if (!dp)
return;
- var layoutParent:ILayoutParent = strand.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var n:int = dp.length;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
index 7474b6f..31c4a41 100644
--- a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
+++ b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
@@ -23,7 +23,7 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.supportClasses.ColumnSeries;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
@@ -83,7 +83,7 @@ package org.apache.flex.charts.beads.layouts
if (!dp)
return;
- var layoutParent:ILayoutParent = strand.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var n:int = dp.length;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/CoreClasses.as b/frameworks/projects/Core/as/src/CoreClasses.as
index ba56798..66df6d0 100644
--- a/frameworks/projects/Core/as/src/CoreClasses.as
+++ b/frameworks/projects/Core/as/src/CoreClasses.as
@@ -46,13 +46,15 @@ internal class CoreClasses
import org.apache.flex.core.IChrome; IChrome;
import org.apache.flex.core.IComboBoxModel; IComboBoxModel;
import org.apache.flex.core.IContainer; IContainer;
+ import org.apache.flex.core.IContainerView; IContainerView;
import org.apache.flex.core.IContentView; IContentView;
+ import org.apache.flex.core.IContentViewHost; IContentViewHost;
import org.apache.flex.core.IDataProviderItemRendererMapper; IDataProviderItemRendererMapper;
import org.apache.flex.core.IDocument; IDocument;
import org.apache.flex.core.IFormatBead; IFormatBead;
import org.apache.flex.core.IImageModel; IImageModel;
import org.apache.flex.core.ILayoutChild; ILayoutChild;
- import org.apache.flex.core.ILayoutParent; ILayoutParent;
+ import org.apache.flex.core.ILayoutHost; ILayoutHost;
import org.apache.flex.core.IPanelModel; IPanelModel;
import org.apache.flex.core.IParent; IParent;
import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
@@ -71,6 +73,8 @@ internal class CoreClasses
import org.apache.flex.core.IViewport; IViewport;
import org.apache.flex.core.IViewportModel; IViewportModel;
import org.apache.flex.core.IViewportScroller; IViewportScroller;
+ import org.apache.flex.core.ListBase; ListBase;
+ import org.apache.flex.core.ListBaseStrandChildren; ListBaseStrandChildren;
import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
import org.apache.flex.core.SimpleApplication; SimpleApplication;
import org.apache.flex.core.DataBindingBase; DataBindingBase;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
index bd2ade4..0d8005a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
@@ -74,7 +74,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class ContainerBase extends UIBase implements IMXMLDocument, IStatesObject, IContainer
+ public class ContainerBase extends UIBase implements IMXMLDocument, IStatesObject, IContainer, IContentViewHost
{
/**
* Constructor.
@@ -87,46 +87,31 @@ package org.apache.flex.core
public function ContainerBase()
{
super();
- actualParent = this;
+
+ _strandChildren = new ContainerBaseStrandChildren(this);
}
- /**
- * False if IChrome children are treated just like
- * any other children.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- protected var supportsChromeChildren:Boolean = true;
-
- private var actualParent:DisplayObjectContainer;
-
- /**
- * Set a platform-specific object as the actual parent for
- * children. This must be public so it can be accessed
- * by beads.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function setActualParent(parent:DisplayObjectContainer):void
- {
- actualParent = parent;
- }
+ private var _strandChildren:ContainerBaseStrandChildren;
+
+ /**
+ * @private
+ */
+ public function get strandChildren():IParent
+ {
+ return _strandChildren;
+ }
/**
* @private
*/
override public function getElementIndex(c:Object):int
{
- if (c is IUIBase)
- return actualParent.getChildIndex(IUIBase(c).element as DisplayObject);
- else
- return actualParent.getChildIndex(c as DisplayObject);
+ var contentView:IContentViewHost = view as IContentViewHost;
+ if (contentView != null) {
+ return contentView.getElementIndex(c);
+ } else {
+ return getChildIndex(c as DisplayObject);
+ }
}
/**
@@ -134,27 +119,15 @@ package org.apache.flex.core
*/
override public function addElement(c:Object, dispatchEvent:Boolean = true):void
{
- if (c is IUIBase)
- {
- if (supportsChromeChildren && c is IChrome) {
- addChild(IUIBase(c).element as DisplayObject);
- IUIBase(c).addedToParent();
- }
- else {
- actualParent.addChild(IUIBase(c).element as DisplayObject);
- IUIBase(c).addedToParent();
- }
- }
- else {
- if (supportsChromeChildren && c is IChrome) {
- addChild(c as DisplayObject);
- }
- else {
- actualParent.addChild(c as DisplayObject);
- }
- }
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenAdded"));
+ var contentView:IParent = view as IParent;
+ if (contentView != null) {
+ contentView.addElement(c, dispatchEvent);
+ }
+ else {
+ addChild(c as DisplayObject);
+ if (dispatchEvent)
+ this.dispatchEvent(new Event("childrenAdded"));
+ }
}
/**
@@ -162,26 +135,15 @@ package org.apache.flex.core
*/
override public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
{
- if (c is IUIBase)
- {
- if (supportsChromeChildren && c is IChrome) {
- addChildAt(IUIBase(c).element as DisplayObject, index);
- IUIBase(c).addedToParent();
- }
- else {
- actualParent.addChildAt(IUIBase(c).element as DisplayObject, index);
- IUIBase(c).addedToParent();
- }
- }
- else {
- if (supportsChromeChildren && c is IChrome) {
- addChildAt(c as DisplayObject, index);
- } else {
- actualParent.addChildAt(c as DisplayObject, index);
- }
- }
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenAdded"));
+ var contentView:IParent = view as IParent;
+ if (contentView != null) {
+ contentView.addElementAt(c, index, dispatchEvent);
+ }
+ else {
+ addChildAt(c as DisplayObject, index);
+ if (dispatchEvent)
+ this.dispatchEvent(new Event("childrenAdded"));
+ }
}
/**
@@ -189,21 +151,15 @@ package org.apache.flex.core
*/
override public function removeElement(c:Object, dispatchEvent:Boolean = true):void
{
- if (c is IUIBase)
- {
- if (supportsChromeChildren && c is IChrome) {
- removeChild(IUIBase(c).element as DisplayObject);
- }
- else {
- actualParent.removeChild(IUIBase(c).element as DisplayObject);
- }
+ var contentView:IParent = view as IParent;
+ if (contentView != null) {
+ contentView.removeElement(c, dispatchEvent);
}
else {
- actualParent.removeChild(c as DisplayObject);
- }
-
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenRemoved"));
+ removeChild(c as DisplayObject);
+ if (dispatchEvent)
+ this.dispatchEvent(new Event("childrenRemoved"));
+ }
}
/**
@@ -212,11 +168,24 @@ package org.apache.flex.core
*/
public function getChildren():Array
{
- var children:Array = [];
- var n:int = actualParent.numChildren;
- for (var i:int = 0; i < n; i++)
- children.push(actualParent.getChildAt(i));
- return children;
+ var contentView:IParent = view as IParent;
+ var children:Array = [];
+ var n:int = 0;
+ var i:int = 0;
+
+ if (contentView != null) {
+ n = contentView.numElements;
+ for (i=0; i < n; i++) {
+ children.push(contentView.getElementAt(i));
+ }
+ }
+ else {
+ for (i = 0; i < n; i++) {
+ children.push(getChildAt(i));
+ }
+ }
+
+ return children;
}
/**
@@ -255,6 +224,60 @@ package org.apache.flex.core
_initialized = true;
}
}
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $numElements():int
+ {
+ return super.numElements();
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $addElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ super.addElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ {
+ super.addElementAt(c, index, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $removeElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ super.removeElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $getElementIndex(c:Object):int
+ {
+ return super.getElementIndex(c);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $getElementAt(index:int):Object
+ {
+ return super.getElementAt(index);
+ }
private var _mxmlDescriptor:Array;
private var _mxmlDocument:Object = this;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as
new file mode 100644
index 0000000..dd78ba2
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as
@@ -0,0 +1,98 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.core
+{
+ /**
+ * The ContainerBaseStrandChildren class the provides a way for advanced
+ * components to place children directly into the strand unlike the
+ * addElement() APIs on the Container which place children into the contentView.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ContainerBaseStrandChildren implements IParent
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ContainerBaseStrandChildren(owner:IParent)
+ {
+ super();
+
+ this.owner = owner as ContainerBase;
+ }
+
+ public var owner:ContainerBase;
+
+ /**
+ * @private
+ */
+ public function get numElements():int
+ {
+ return owner.$numElements();
+ }
+
+ /**
+ * @private
+ */
+ public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ owner.$addElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ {
+ owner.$addElementAt(c, index, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ owner.$removeElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function getElementIndex(c:Object):int
+ {
+ return owner.$getElementIndex(c);
+ }
+
+ /**
+ * @private
+ */
+ public function getElementAt(index:int):Object
+ {
+ return owner.$getElementAt(index);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/IContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IContainerView.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IContainerView.as
new file mode 100644
index 0000000..ae07cb7
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IContainerView.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.core
+{
+ /**
+ * The IContainerView interface should be implemented by any view bead
+ * that acts as the primary view for a ContainerBase-derived class.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface IContainerView extends IParent
+ {
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/IContentViewHost.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IContentViewHost.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IContentViewHost.as
new file mode 100644
index 0000000..b7ff5ff
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IContentViewHost.as
@@ -0,0 +1,35 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.core
+{
+ /**
+ * This interface is implemented by components that provide
+ * access to "behind the scenes" children that are not accessible
+ * through the addElement()/removeElement() APIs.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface IContentViewHost extends IParent
+ {
+ function get strandChildren():IParent;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
new file mode 100644
index 0000000..3f36723
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.core
+{
+ /**
+ * The ILayoutHost interface is the basic interface for the
+ * container views that have an IBeadLayout. The layout implementation
+ * often needs to know certain things about other objects in
+ * the view.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface ILayoutHost
+ {
+ /**
+ * The container that parents all of the content.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get contentView():IParentIUIBase;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutParent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutParent.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutParent.as
deleted file mode 100644
index 0d06b50..0000000
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutParent.as
+++ /dev/null
@@ -1,56 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.core
-{
- /**
- * The ILayoutParent interface is the basic interface for the
- * container views that have an IBeadLayout. The layout implementation
- * often needs to know certain things about other objects in
- * the view.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public interface ILayoutParent
- {
- /**
- * The container that parents all of the content.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get contentView():IParentIUIBase;
-
- /**
- * The container whose size changes
- * imply the need for another layout pass. This
- * is normally the host component.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get resizableView():IUIBase;
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as
new file mode 100644
index 0000000..48c3438
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as
@@ -0,0 +1,123 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.core
+{
+ import flash.display.DisplayObject;
+ import flash.display.DisplayObjectContainer;
+
+ import org.apache.flex.core.IMXMLDocument;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.ValueChangeEvent;
+ import org.apache.flex.states.State;
+ import org.apache.flex.utils.MXMLDataInterpreter;
+
+ /**
+ * The ListBase class is the base class for most lists
+ * in FlexJS.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ListBase extends UIBase implements IContentViewHost
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ListBase()
+ {
+ super();
+
+ _strandChildren = new ListBaseStrandChildren(this);
+ }
+
+ private var _strandChildren:ListBaseStrandChildren;
+
+ /**
+ * @private
+ */
+ public function get strandChildren():IParent
+ {
+ return _strandChildren;
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $numElements():int
+ {
+ return super.numElements();
+ }
+
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $addElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ super.addElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ {
+ super.addElementAt(c, index, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $removeElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ super.removeElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $getElementIndex(c:Object):int
+ {
+ return super.getElementIndex(c);
+ }
+
+ /**
+ * @private
+ * Support strandChildren.
+ */
+ public function $getElementAt(index:int):Object
+ {
+ return super.getElementAt(index);
+ }
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as
new file mode 100644
index 0000000..899c171
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as
@@ -0,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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.core
+{
+
+
+ /**
+ * The ListBaseStrandChildren exists so that Lists are compatible with
+ * the ListView/ContainerView beads.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ListBaseStrandChildren implements IParent
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ListBaseStrandChildren(owner:IParent)
+ {
+ super();
+
+ this.owner = owner as ListBase;
+ }
+
+ public var owner:ListBase;
+
+ /**
+ * @private
+ */
+ public function get numElements():int
+ {
+ return owner.$numElements();
+ }
+
+ /**
+ * @private
+ */
+ public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ owner.$addElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ {
+ owner.$addElementAt(c, index, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ owner.$removeElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function getElementIndex(c:Object):int
+ {
+ return owner.$getElementIndex(c);
+ }
+
+ /**
+ * @private
+ */
+ public function getElementAt(index:int):Object
+ {
+ return owner.$getElementAt(index);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
index 74c30ce..e1cc8e6 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
@@ -62,8 +62,6 @@ package org.apache.flex.core
public function ViewBase()
{
super();
-
- supportsChromeChildren = false;
className = "flexjs";
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
index 34a3d7a..4de63f6 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
@@ -14,7 +14,8 @@
goog.provide('org.apache.flex.core.ContainerBase');
-goog.require('org.apache.flex.core.IChrome');
+goog.require('org.apache.flex.core.ContainerBaseStrandChildren');
+goog.require('org.apache.flex.core.IContentViewHost');
goog.require('org.apache.flex.core.IMXMLDocument');
goog.require('org.apache.flex.core.UIBase');
goog.require('org.apache.flex.core.ValuesManager');
@@ -24,6 +25,8 @@ goog.require('org.apache.flex.core.ValuesManager');
/**
* @constructor
* @extends {org.apache.flex.core.UIBase}
+ * @implements {org.apache.flex.core.IMXMLDocument}
+ * @implements {org.apache.flex.core.IContentViewHost}
*/
org.apache.flex.core.ContainerBase = function() {
this.mxmlProperties = null;
@@ -53,6 +56,12 @@ org.apache.flex.core.ContainerBase = function() {
*/
this.currentState_ = null;
+ /**
+ * @private
+ * @type {Object}
+ */
+ this.strandChildren_ = new org.apache.flex.core.ContainerBaseStrandChildren(this);
+
this.document = this;
this.actualParent_ = this;
@@ -103,7 +112,8 @@ org.apache.flex.core.ContainerBase.prototype.supportsChrome = true;
org.apache.flex.core.ContainerBase.prototype.FLEXJS_CLASS_INFO =
{ names: [{ name: 'ContainerBase',
qName: 'org.apache.flex.core.ContainerBase'}] ,
- interfaces: [org.apache.flex.core.IMXMLDocument]};
+ interfaces: [org.apache.flex.core.IMXMLDocument,
+ org.apache.flex.core.IContentViewHost]};
/**
@@ -146,67 +156,41 @@ org.apache.flex.core.ContainerBase.prototype.setMXMLDescriptor =
/**
- * @expose
- * @param {Object} parent The component to use as the parent of the children for the container.
- */
-org.apache.flex.core.ContainerBase.prototype.setActualParent = function(parent) {
- this.actualParent_ = parent;
-};
-
-
-/**
* @override
+ * @param {Object} c
+ * @param {boolean=} opt_dispatchEvent
*/
org.apache.flex.core.ContainerBase.prototype.addElement = function(c, opt_dispatchEvent) {
if (opt_dispatchEvent === undefined)
opt_dispatchEvent = true;
- if (this.supportsChromeChildren && org.apache.flex.utils.Language.is(c, org.apache.flex.core.IChrome)) {
- //org.apache.flex.core.ContainerBase.base(this, 'addElement', c);
- this.element.appendChild(c.positioner);
- c.addedToParent();
+ var contentView = this.view;
+ if (contentView != null) {
+ contentView.addElement(c, opt_dispatchEvent);
}
else {
- //this.actualParent.addElement(c);
- this.actualParent.element.appendChild(c.positioner);
- c.addedToParent();
+ this.$addElement(c, opt_dispatchEvent);
}
- if (opt_dispatchEvent)
- this.dispatchEvent('childrenAdded');
};
/**
* @override
+ * @param {Object} c
+ * @param {number} index
+ * @param {boolean=} opt_dispatchEvent
*/
org.apache.flex.core.ContainerBase.prototype.addElementAt = function(c, index, opt_dispatchEvent) {
if (opt_dispatchEvent === undefined)
opt_dispatchEvent = true;
- if (this.supportsChromeChildren && org.apache.flex.utils.Language.is(c, org.apache.flex.core.IChrome)) {
- //org.apache.flex.core.ContainerBase.base(this, 'addElementAt', c, index);
- var children1 = this.internalChildren();
- if (index >= children1.length) {
- this.addElement(c);
- } else {
- this.element.insertBefore(c.positioner,
- children1[index]);
- c.addedToParent();
- }
- } else {
- //this.actualParent.addElementAt(c, index);
- var children2 = this.actualParent.internalChildren();
- if (index >= children2.length) {
- this.actualParent.element.appendChild(c.positioner);
- c.addedToParent();
- } else {
- this.actualParent.element.insertBefore(c.positioner,
- children2[index]);
- c.addedToParent();
- }
- }
- if (opt_dispatchEvent)
- this.dispatchEvent('childrenAdded');
+ var contentView = this.view;
+ if (contentView != null) {
+ contentView.addElementAt(c, index, opt_dispatchEvent);
+ }
+ else {
+ this.$addElementAt(c, index, opt_dispatchEvent);
+ }
};
@@ -214,20 +198,26 @@ org.apache.flex.core.ContainerBase.prototype.addElementAt = function(c, index, o
* @override
*/
org.apache.flex.core.ContainerBase.prototype.getElementAt = function(index) {
- var children = this.actualParent.internalChildren();
- return children[index].flexjs_wrapper;
+ var contentView = this.view;
+ if (contentView != null) {
+ return contentView.getElementAt(index);
+ } else {
+ return this.$getElementAt(index);
+ }
};
/**
- * @param {Object} c The child element.
+ * @override
+ * @param {Object} c
+ * @param {boolean=} opt_dispatchEvent
*/
-org.apache.flex.core.ContainerBase.prototype.removeElement = function(c) {
- if (this.supportsChromeChildren && org.apache.flex.utils.Language.is(c, org.apache.flex.core.IChrome)) {
- this.element.removeChild(c.element);
- }
- else {
- this.actualParent.element.removeChild(c.element);
+org.apache.flex.core.ContainerBase.prototype.removeElement = function(c, opt_dispatchEvent) {
+ var contentView = this.view;
+ if (contentView != null) {
+ contentView.removeElement(c, opt_dispatchEvent);
+ } else {
+ this.$removeElement(c, opt_dispatchEvent);
}
};
@@ -236,20 +226,98 @@ org.apache.flex.core.ContainerBase.prototype.removeElement = function(c) {
* @override
*/
org.apache.flex.core.ContainerBase.prototype.getElementIndex = function(c) {
- var children;
- if (this.supportsChromeChildren && org.apache.flex.utils.Language.is(c, org.apache.flex.core.IChrome)) {
- children = this.internalChildren();
+ var contentView = this.view;
+ if (contentView != null) {
+ return contentView(c);
+ } else {
+ return this.$getElementIndex(c);
}
- else {
- children = this.actualParent.internalChildren();
- }
- var n = children.length;
- for (var i = 0; i < n; i++)
- {
- if (children[i] == c.element)
- return i;
+};
+
+
+/**
+ * @expose
+ * @return {number} The number of raw elements.
+ */
+org.apache.flex.core.ContainerBase.prototype.$numElements = function() {
+ return this.internalChildren().length;
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element to add.
+ * @param {boolean=} opt_dispatchEvent If true, an event is dispatched.
+ */
+org.apache.flex.core.ContainerBase.prototype.$addElement = function(c, opt_dispatchEvent) {
+ if (opt_dispatchEvent === undefined)
+ opt_dispatchEvent = true;
+ this.element.appendChild(c.positioner);
+ c.addedToParent();
+ if (opt_dispatchEvent)
+ this.dispatchEvent('childrenAdded');
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element to add.
+ * @param {number} index The index of the element.
+ * @param {boolean=} opt_dispatchEvent If true, an event is dispatched.
+ */
+org.apache.flex.core.ContainerBase.prototype.$addElementAt = function(c, index, opt_dispatchEvent) {
+ if (opt_dispatchEvent === undefined)
+ opt_dispatchEvent = true;
+ var children1 = this.internalChildren();
+ if (index >= children1.length) {
+ this.$addElement(c, false);
+ } else {
+ this.element.insertBefore(c.positioner,
+ children1[index]);
+ c.addedToParent();
}
- return -1;
+ if (opt_dispatchEvent)
+ this.dispatchEvent('childrenAdded');
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element to add.
+ * @param {boolean=} opt_dispatchEvent If true, an event is dispatched.
+ */
+org.apache.flex.core.ContainerBase.prototype.$removeElement = function(c, opt_dispatchEvent) {
+ this.element.removeChild(c.element);
+ if (opt_dispatchEvent)
+ this.dispatchEvent('childrenRemoved');
+};
+
+
+/**
+ * @expose
+ * @param {number} index The index of the number.
+ * @return {Object} The element at the given index.
+ */
+org.apache.flex.core.ContainerBase.prototype.$getElementAt = function(index) {
+ var children = this.internalChildren();
+ return children[index].flexjs_wrapper;
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element being queried.
+ * @return {number} The index of the element.
+ */
+org.apache.flex.core.ContainerBase.prototype.$getElementIndex = function(c) {
+ var children = this.internalChildren();
+ var n = children.length;
+ for (var i = 0; i < n; i++)
+ {
+ if (children[i] == c.element)
+ return i;
+ }
+ return -1;
};
@@ -318,5 +386,12 @@ Object.defineProperties(org.apache.flex.core.ContainerBase.prototype, {
set: function(s) {
this.actualParent_ = s;
}
+ },
+ /** @export */
+ strandChildren: {
+ /** @this {org.apache.flex.core.ContainerBase} */
+ get: function() {
+ return this.strandChildren_;
+ }
}
});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBaseStrandChildren.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBaseStrandChildren.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBaseStrandChildren.js
new file mode 100644
index 0000000..51ac09a
--- /dev/null
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBaseStrandChildren.js
@@ -0,0 +1,112 @@
+/**
+ * Licensed 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.
+ */
+
+goog.provide('org.apache.flex.core.ContainerBaseStrandChildren');
+
+goog.require('org.apache.flex.core.IParent');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IParent}
+ * @param {Object} owner The base owner of this object.
+ */
+org.apache.flex.core.ContainerBaseStrandChildren = function(owner) {
+ this.owner_ = owner;
+};
+
+
+/**
+ * @private
+ * @type {Object}
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.owner_ = null;
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'ContainerBaseStrandChildren',
+ qName: 'org.apache.flex.core.ContainerBaseStrandChildren'}] ,
+ interfaces: [org.apache.flex.core.IParent]};
+
+
+/**
+ * @export
+ * @return {number} The number of non-content children elements
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.numElements =
+ function() {
+ return this.owner_.$numElements();
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element to be added.
+ * @param {boolean=} opt_dispatchEvent Whether or not to dispatch an event.
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.addElement =
+ function(c, opt_dispatchEvent) {
+ this.owner_.$addElement(c, opt_dispatchEvent);
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element to be added.
+ * @param {number} index The index of the new element.
+ * @param {boolean=} opt_dispatchEvent Whether or not to dispatch an event.
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.addElementAt =
+ function(c, index, opt_dispatchEvent) {
+ this.owner_.$addElementAt(c, index, opt_dispatchEvent);
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element to be removed.
+ * @param {boolean=} opt_dispatchEvent Whether or not to dispatch an event.
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.removeElement =
+ function(c, opt_dispatchEvent) {
+ this.owner_.$removeElement(c, opt_dispatchEvent);
+};
+
+
+/**
+ * @export
+ * @param {number} index The index of the element sought.
+ * @return {Object} The element at the given index.
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.getElementAt =
+ function(index) {
+ return this.owner_.$getElementAt(index);
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element in question.
+ * @return {number} The index of the element.
+ */
+org.apache.flex.core.ContainerBaseStrandChildren.prototype.getElementIndex =
+ function(c) {
+ return this.owner_.$getElementIndex(c);
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/IContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/IContainerView.js b/frameworks/projects/Core/js/src/org/apache/flex/core/IContainerView.js
new file mode 100644
index 0000000..4b74c52
--- /dev/null
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/IContainerView.js
@@ -0,0 +1,44 @@
+/**
+ * Licensed 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.
+ */
+
+/**
+ * org.apache.flex.core.IContainerView
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('org.apache.flex.core.IContainerView');
+
+goog.require('org.apache.flex.core.IParent');
+
+
+
+/**
+ * @interface
+ */
+org.apache.flex.core.IContainerView = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.core.IContainerView.prototype.FLEXJS_CLASS_INFO = {
+ names: [{ name: 'IContainerView', qName: 'org.apache.flex.core.IContainerView'}],
+ interfaces: [org.apache.flex.core.IParent]
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/IContentViewHost.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/IContentViewHost.js b/frameworks/projects/Core/js/src/org/apache/flex/core/IContentViewHost.js
new file mode 100644
index 0000000..708e532
--- /dev/null
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/IContentViewHost.js
@@ -0,0 +1,52 @@
+/**
+ * Licensed 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.
+ */
+
+/**
+ * org.apache.flex.core.IContentViewHost
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('org.apache.flex.core.IContentViewHost');
+
+goog.require('org.apache.flex.core.IParent');
+
+
+
+/**
+ * @interface
+ */
+org.apache.flex.core.IContentViewHost = function() {
+};
+
+
+Object.defineProperties(org.apache.flex.core.IContentViewHost.prototype, {
+ /** @export */
+ strandChildren: {
+ get: function() {}
+ }
+});
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.core.IContentViewHost.prototype.FLEXJS_CLASS_INFO = {
+ names: [{ name: 'IContentViewHost', qName: 'org.apache.flex.core.IContentViewHost'}],
+ interfaces: [org.apache.flex.core.IParent]
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutHost.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutHost.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutHost.js
new file mode 100644
index 0000000..efada4a
--- /dev/null
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutHost.js
@@ -0,0 +1,46 @@
+/**
+ * Licensed 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.
+ */
+
+/**
+ * @fileoverview
+ * @suppress {checkTypes}
+ */
+
+goog.provide('org.apache.flex.core.ILayoutHost');
+
+
+
+/**
+ * @interface
+ */
+org.apache.flex.core.ILayoutHost = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.core.ILayoutHost.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'ILayoutHost',
+ qName: 'org.apache.flex.core.ILayoutHost' }] };
+
+
+Object.defineProperties(org.apache.flex.core.ILayoutHost.prototype, {
+ /** @export */
+ contentView: {
+ get: function() {}
+ }
+});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutParent.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutParent.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutParent.js
deleted file mode 100644
index 6e553b9..0000000
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/ILayoutParent.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed 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.
- */
-
-/**
- * @fileoverview
- * @suppress {checkTypes}
- */
-
-goog.provide('org.apache.flex.core.ILayoutParent');
-
-
-
-/**
- * @interface
- */
-org.apache.flex.core.ILayoutParent = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.core.ILayoutParent.prototype.FLEXJS_CLASS_INFO =
- { names: [{ name: 'ILayoutParent',
- qName: 'org.apache.flex.core.ILayoutParent' }] };
-
-
-Object.defineProperties(org.apache.flex.core.ILayoutParent.prototype, {
- /** @export */
- contentView: {
- get: function() {}
- },
- /** @export */
- border: {
- get: function() {}
- },
- /** @export */
- vScrollBar: {
- get: function() {},
- set: function(value) {}
- },
- /** @export */
- resizeableView: {
- get: function() {}
- }
-});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/IParent.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/IParent.js b/frameworks/projects/Core/js/src/org/apache/flex/core/IParent.js
index 2b58163..8bae15a 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/IParent.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/IParent.js
@@ -33,15 +33,17 @@ org.apache.flex.core.IParent = function() {
/**
* @param {Object} c
+ * @param {boolean=} opt_dispatchEvent
*/
-org.apache.flex.core.IParent.prototype.addElement = function(c) {};
+org.apache.flex.core.IParent.prototype.addElement = function(c, opt_dispatchEvent) {};
/**
* @param {Object} c
* @param {number} index
+ * @param {boolean=} opt_dispatchEvent
*/
-org.apache.flex.core.IParent.prototype.addElementAt = function(c, index) {};
+org.apache.flex.core.IParent.prototype.addElementAt = function(c, index, opt_dispatchEvent) {};
/**
@@ -53,8 +55,9 @@ org.apache.flex.core.IParent.prototype.getElementIndex = function(c) {};
/**
* @param {Object} c
+ * @param {boolean=} opt_dispatchEvent
*/
-org.apache.flex.core.IParent.prototype.removeElement = function(c) {};
+org.apache.flex.core.IParent.prototype.removeElement = function(c, opt_dispatchEvent) {};
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/ListBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ListBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ListBase.js
index 234cf30..70811bf 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/ListBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ListBase.js
@@ -14,14 +14,17 @@
goog.provide('org.apache.flex.core.ListBase');
-goog.require('org.apache.flex.core.ContainerBase');
+goog.require('org.apache.flex.core.IContentViewHost');
+goog.require('org.apache.flex.core.ListBaseStrandChildren');
+goog.require('org.apache.flex.core.UIBase');
goog.require('org.apache.flex.html.supportClasses.StringItemRenderer');
/**
* @constructor
- * @extends {org.apache.flex.core.ContainerBase}
+ * @extends {org.apache.flex.core.UIBase}
+ * @implements {org.apache.flex.core.IContentViewHost}
*/
org.apache.flex.core.ListBase = function() {
org.apache.flex.core.ListBase.base(this, 'constructor');
@@ -31,9 +34,15 @@ org.apache.flex.core.ListBase = function() {
* @type {number}
*/
this.selectedIndex_ = -1;
+
+ /**
+ * @private
+ * @type {Object}
+ */
+ this.strandChildren_ = new org.apache.flex.core.ListBaseStrandChildren(this);
};
goog.inherits(org.apache.flex.core.ListBase,
- org.apache.flex.core.ContainerBase);
+ org.apache.flex.core.UIBase);
/**
@@ -43,7 +52,8 @@ goog.inherits(org.apache.flex.core.ListBase,
*/
org.apache.flex.core.ListBase.prototype.FLEXJS_CLASS_INFO =
{ names: [{ name: 'ListBase',
- qName: 'org.apache.flex.core.ListBase' }] };
+ qName: 'org.apache.flex.core.ListBase' }],
+ interfaces: [org.apache.flex.core.IContentViewHost] };
/**
@@ -66,6 +76,56 @@ org.apache.flex.core.ListBase.prototype.createElement = function() {
};
+/**
+ * @expose
+ * @return {number} The number of raw elements.
+ */
+org.apache.flex.core.ListBase.prototype.$numElements = function() {
+ return this.numElements();
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element to add.
+ * @param {boolean=} opt_dispatchEvent If true, an event is dispatched.
+ */
+org.apache.flex.core.ListBase.prototype.$addElement = function(c, opt_dispatchEvent) {
+ this.addElement(c, opt_dispatchEvent);
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element to add.
+ * @param {number} index The index of the element.
+ * @param {boolean=} opt_dispatchEvent If true, an event is dispatched.
+ */
+org.apache.flex.core.ListBase.prototype.$addElementAt = function(c, index, opt_dispatchEvent) {
+ this.addElementAt(c, index, opt_dispatchEvent);
+};
+
+
+/**
+ * @expose
+ * @param {number} index The index of the number.
+ * @return {Object} The element at the given index.
+ */
+org.apache.flex.core.ListBase.prototype.$getElementAt = function(index) {
+ return this.getElementAt(index);
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element being queried.
+ * @return {number} The index of the element.
+ */
+org.apache.flex.core.ListBase.prototype.$getElementIndex = function(c) {
+ return this.getElementIndex(c);
+};
+
+
Object.defineProperties(org.apache.flex.core.ListBase.prototype, {
/** @export */
dataProvider: {
@@ -99,6 +159,13 @@ Object.defineProperties(org.apache.flex.core.ListBase.prototype, {
set: function(value) {
this.model.selectedItem = value;
}
+ },
+ /** @export */
+ strandChildren: {
+ /** @this {org.apache.flex.core.ListBase} */
+ get: function() {
+ return this.strandChildren_;
+ }
}
});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/ListBaseStrandChildren.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ListBaseStrandChildren.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ListBaseStrandChildren.js
new file mode 100644
index 0000000..ccc04a2
--- /dev/null
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ListBaseStrandChildren.js
@@ -0,0 +1,112 @@
+/**
+ * Licensed 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.
+ */
+
+goog.provide('org.apache.flex.core.ListBaseStrandChildren');
+
+goog.require('org.apache.flex.core.IParent');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IParent}
+ * @param {Object} owner The base owner of this object.
+ */
+org.apache.flex.core.ListBaseStrandChildren = function(owner) {
+ this.owner_ = owner;
+};
+
+
+/**
+ * @private
+ * @type {Object}
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.owner_ = null;
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'ListBaseStrandChildren',
+ qName: 'org.apache.flex.core.ListBaseStrandChildren'}] ,
+ interfaces: [org.apache.flex.core.IParent]};
+
+
+/**
+ * @export
+ * @return {number} The number of non-content children elements
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.numElements =
+ function() {
+ return this.owner_.$numElements();
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element to be added.
+ * @param {boolean=} opt_dispatchEvent Whether or not to dispatch an event.
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.addElement =
+ function(c, opt_dispatchEvent) {
+ this.owner_.$addElement(c, opt_dispatchEvent);
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element to be added.
+ * @param {number} index The index of the new element.
+ * @param {boolean=} opt_dispatchEvent Whether or not to dispatch an event.
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.addElementAt =
+ function(c, index, opt_dispatchEvent) {
+ this.owner_.$addElementAt(c, index, opt_dispatchEvent);
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element to be removed.
+ * @param {boolean=} opt_dispatchEvent Whether or not to dispatch an event.
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.removeElement =
+ function(c, opt_dispatchEvent) {
+ this.owner_.$removeElement(c, opt_dispatchEvent);
+};
+
+
+/**
+ * @export
+ * @param {number} index The index of the element sought.
+ * @return {Object} The element at the given index.
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.getElementAt =
+ function(index) {
+ return this.owner_.$getElementAt(index);
+};
+
+
+/**
+ * @export
+ * @param {Object} c The element in question.
+ * @return {number} The index of the element.
+ */
+org.apache.flex.core.ListBaseStrandChildren.prototype.getElementIndex =
+ function(c) {
+ return this.owner_.$getElementIndex(c);
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
index ef667c9..5642cd0 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
@@ -682,6 +682,29 @@ Object.defineProperties(org.apache.flex.core.UIBase.prototype, {
}
},
/** @export */
+ view: {
+ /** @this {org.apache.flex.core.UIBase} */
+ get: function() {
+ if (this.view_ == null) {
+ /**
+ * @type {Function}
+ */
+ var v = /** @type {Function} */(org.apache.flex.core.ValuesManager.valuesImpl.
+ getValue(this, 'iBeadView'));
+ this.view_ = new v();
+ this.addBead(this.view_);
+ }
+ return this.view_;
+ },
+ /** @this {org.apache.flex.core.UIBase} */
+ set: function(value) {
+ if (this.view_ != value) {
+ this.view_ = value;
+ this.addBead(value);
+ }
+ }
+ },
+ /** @export */
visible: {
/** @this {org.apache.flex.core.UIBase} */
get: function() {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/Flat/flat-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/flat-manifest.xml b/frameworks/projects/Flat/flat-manifest.xml
index 253aaf6..b289d9a 100644
--- a/frameworks/projects/Flat/flat-manifest.xml
+++ b/frameworks/projects/Flat/flat-manifest.xml
@@ -54,7 +54,7 @@
<component id="HorizontalLayout" class="org.apache.flex.html.beads.layouts.HorizontalLayout" lookupOnly="true" />
<component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout" lookupOnly="true" />
<component id="ListView" class="org.apache.flex.html.beads.ListView" lookupOnly="true" />
- <component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState" lookupOnly="true" />
+ <!--component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState" lookupOnly="true" /-->
<component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView" lookupOnly="true" />
<component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert" lookupOnly="true" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
index 7e4d744..10a2304 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
@@ -20,18 +20,38 @@ package org.apache.flex.html
{
import org.apache.flex.core.IFactory;
- import org.apache.flex.core.ContainerBase;
+ import org.apache.flex.core.ContainerBaseStrandChildren;
+ import org.apache.flex.core.IContentViewHost;
import org.apache.flex.core.IDataProviderItemRendererMapper;
import org.apache.flex.core.IItemRendererClassFactory;
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.IRollOverModel;
import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.ListBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.html.beads.models.ListPresentationModel;
+ /**
+ * Indicates that the initialization of the list is complete.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="initComplete", type="org.apache.flex.events.Event")]
+
+ /**
+ * The change event is dispatched whenever the list's selection changes.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
[Event(name="change", type="org.apache.flex.events.Event")]
/**
@@ -51,7 +71,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class List extends ContainerBase
+ public class List extends ListBase
{
/**
* constructor.
@@ -226,7 +246,8 @@ package org.apache.flex.html
itemRendererFactory = new (ValuesManager.valuesImpl.getValue(this, "iItemRendererClassFactory")) as IItemRendererClassFactory;
addBead(itemRendererFactory);
}
-// IEventDispatcher(this).dispatchEvent(new Event("layoutNeeded"));
+
+ dispatchEvent(new Event("initComplete"));
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/NumericStepper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/NumericStepper.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/NumericStepper.as
index b7e6c13..66b8407 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/NumericStepper.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/NumericStepper.as
@@ -19,6 +19,7 @@
package org.apache.flex.html
{
import org.apache.flex.core.IRangeModel;
+ import org.apache.flex.core.UIBase;
[Event(name="valueChange", type="org.apache.flex.events.Event")]
@@ -36,7 +37,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NumericStepper extends Container
+ public class NumericStepper extends UIBase
{
/**
* constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
index cf7ad85..7add594 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as
@@ -23,7 +23,6 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadModel;
- import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.IParent;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.ValuesManager;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
index 609b2a9..f71a4ef 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
@@ -26,8 +26,10 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IContainer;
+ import org.apache.flex.core.IContainerView;
+ import org.apache.flex.core.IContentViewHost;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -61,7 +63,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class ContainerView extends BeadViewBase implements IBeadView, ILayoutParent
+ public class ContainerView extends BeadViewBase implements IBeadView, IContainerView, ILayoutHost
{
/**
* The ContainerView class is the default view for
@@ -142,6 +144,54 @@ package org.apache.flex.html.beads
private var layoutRunning:Boolean;
/**
+ * @private
+ */
+ public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ contentView.addElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ {
+ contentView.addElementAt(c, index, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function getElementIndex(c:Object):int
+ {
+ return contentView.getElementIndex(c);
+ }
+
+ /**
+ * @private
+ */
+ public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ {
+ contentView.removeElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ */
+ public function get numElements():int
+ {
+ return contentView.numElements();
+ }
+
+ /**
+ * @private
+ */
+ public function getElementAt(index:int):Object
+ {
+ return contentView.getElementAt(index);
+ }
+
+ /**
* Strand setter.
*
* @langversion 3.0
@@ -155,8 +205,8 @@ package org.apache.flex.html.beads
super.strand = value;
createViewport();
- (host as UIBase).addElement(viewport.contentView, false);
- ContainerBase(host).setActualParent(viewport.contentView as DisplayObjectContainer);
+
+ (host as IContentViewHost).strandChildren.addElement(viewport.contentView, false);
displayBackgroundAndBorder(host as UIBase);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
index 258de18..9deec3e 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
@@ -27,7 +27,6 @@ package org.apache.flex.html.beads
import org.apache.flex.core.ISelectableItemRenderer;
import org.apache.flex.core.IItemRenderer;
import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.IScrollingLayoutParent;
import org.apache.flex.core.IParent;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IRollOverModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
index ab2bb96..7cc229d 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
@@ -21,7 +21,6 @@ package org.apache.flex.html.beads
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.IParent;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IRangeModel;
@@ -33,7 +32,6 @@ package org.apache.flex.html.beads
import org.apache.flex.html.Label;
import org.apache.flex.html.Spinner;
import org.apache.flex.html.TextInput;
- import org.apache.flex.html.beads.layouts.HorizontalLayout;
import org.apache.flex.html.supportClasses.Border;
import org.apache.flex.html.supportClasses.ScrollBar;
@@ -48,7 +46,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NumericStepperView extends BeadViewBase implements IBeadView, ILayoutParent
+ public class NumericStepperView extends BeadViewBase implements IBeadView
{
/**
* constructor.
@@ -77,9 +75,6 @@ package org.apache.flex.html.beads
override public function set strand(value:IStrand):void
{
super.strand = value;
-
- // add a horizontal layout bead
- value.addBead(new HorizontalLayout());
// add an input field
input = new TextInput();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelView.as
index aaa06eb..b3970af 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelView.as
@@ -22,6 +22,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.ILayoutChild;
+ import org.apache.flex.core.IContentViewHost;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.IViewportModel;
@@ -113,7 +114,7 @@ package org.apache.flex.html.beads
override protected function completeSetup():void
{
- UIBase(_strand).addElement(titleBar);
+ (host as IContentViewHost).strandChildren.addElement(titleBar);
super.completeSetup();
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelWithControlBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelWithControlBarView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelWithControlBarView.as
index e513963..8dfcd42 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelWithControlBarView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/PanelWithControlBarView.as
@@ -21,6 +21,7 @@ package org.apache.flex.html.beads
import flash.display.Sprite;
import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IContentViewHost;
import org.apache.flex.core.ILayoutChild;
import org.apache.flex.core.IPanelModel;
import org.apache.flex.core.IStrand;
@@ -133,10 +134,10 @@ package org.apache.flex.html.beads
{
super.completeSetup();
- UIBase(_strand).addElement(titleBar, false);
+ (_strand as IContentViewHost).strandChildren.addElement(titleBar, false);
if (controlBar) {
- UIBase(_strand).addElement(_controlBar, false);
+ (_strand as IContentViewHost).strandChildren.addElement(_controlBar, false);
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
index 6ae249f..4b6aa2a 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
@@ -21,7 +21,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -80,7 +80,7 @@ package org.apache.flex.html.beads.layouts
public function layout():Boolean
{
//trace(DOMPathUtil.getPath(host), event ? event.type : "fixed size");
- var layoutParent:ILayoutParent = host.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent ? layoutParent.contentView : IParentIUIBase(host);
var gotMargin:Boolean;
[24/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
go back to using range of years
Posted by ah...@apache.org.
go back to using range of years
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0f2bf88f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0f2bf88f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0f2bf88f
Branch: refs/heads/core_js_to_as
Commit: 0f2bf88faddabbf507c7212f6da75474d0adc54c
Parents: e945a9e
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 15 22:22:03 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 15 22:22:03 2015 -0700
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0f2bf88f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 76f24f4..57ccb0c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache FlexJS
-Copyright 2015 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[36/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
- Fixed an invalid dependency of refrences to ILayoutParent which was renamed
to ILayoutHost
Posted by ah...@apache.org.
- Fixed an invalid dependency of refrences to ILayoutParent which was renamed to ILayoutHost
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0a2fbbd5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0a2fbbd5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0a2fbbd5
Branch: refs/heads/core_js_to_as
Commit: 0a2fbbd513b2f7b37a617cd6e2640565c7df07f1
Parents: 58c24a2
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 22 19:46:53 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 22 19:46:53 2015 +0200
----------------------------------------------------------------------
.../HTML/js/src/org/apache/flex/html/beads/ListView.js | 6 +++---
.../src/org/apache/flex/html/beads/ScrollingContainerView.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0a2fbbd5/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
index 8f3ab66..89401f2 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
@@ -17,7 +17,7 @@ goog.provide('org.apache.flex.html.beads.ListView');
goog.require('org.apache.flex.core.IBeadLayout');
goog.require('org.apache.flex.core.IBeadView');
goog.require('org.apache.flex.core.IItemRendererParent');
-goog.require('org.apache.flex.core.ILayoutParent');
+goog.require('org.apache.flex.core.ILayoutHost');
goog.require('org.apache.flex.core.ValuesManager');
goog.require('org.apache.flex.html.beads.ContainerView');
goog.require('org.apache.flex.html.beads.IListView');
@@ -30,7 +30,7 @@ goog.require('org.apache.flex.html.supportClasses.DataGroup');
/**
* @constructor
* @extends {org.apache.flex.html.beads.ContainerView}
- * @implements {org.apache.flex.core.ILayoutParent}
+ * @implements {org.apache.flex.core.ILayoutHost}
* @implements {org.apache.flex.html.beads.IListView}
*/
org.apache.flex.html.beads.ListView = function() {
@@ -53,7 +53,7 @@ org.apache.flex.html.beads.ListView.prototype.
FLEXJS_CLASS_INFO =
{ names: [{ name: 'ListView',
qName: 'org.apache.flex.html.beads.ListView' }],
- interfaces: [org.apache.flex.html.beads.IListView, org.apache.flex.core.ILayoutParent] };
+ interfaces: [org.apache.flex.html.beads.IListView, org.apache.flex.core.ILayoutHost] };
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0a2fbbd5/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ScrollingContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ScrollingContainerView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ScrollingContainerView.js
index 64ddfac..c4a7eac 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ScrollingContainerView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ScrollingContainerView.js
@@ -41,7 +41,7 @@ goog.inherits(
org.apache.flex.html.beads.ScrollingContainerView.prototype.FLEXJS_CLASS_INFO =
{ names: [{ name: 'ScrollingContainerView',
qName: 'org.apache.flex.html.beads.ScrollingContainerView' }],
- interfaces: [org.apache.flex.core.ILayoutParent]
+ interfaces: [org.apache.flex.core.ILayoutHost]
};
[46/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Merge branch 'develop' into core_js_to_as
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
index 7566a04,a1a0b7b..3cc7040
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
@@@ -1,98 -1,50 +1,51 @@@
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+ // 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.core
{
+ import org.apache.flex.geom.Rectangle;
+
/**
- * A Viewport is a window onto an area of content. A viewport is given space
- * in which to operate by a View bead and given this model with the properties
- * necessary for its function.
+ * A Viewport is the area of a Container set aside for displaying
+ * content and any scrolling controls.
+ * The ViewportModel caches the offsets required to compute the size
+ * of the Viewport.
*/
- public interface IViewportModel extends IBead
+ COMPILE::AS3
+ public interface IViewportModel extends IBeadModel
{
- // Layout and Content
-
- /**
- * Returns true (or set to true) when the contentArea is
- * actually the same as the host strand.
- */
- function get contentIsHost():Boolean;
- function set contentIsHost(value:Boolean):void;
-
- /**
- * The content area being managed by the viewport
- */
- function get contentArea():IUIBase;
- function set contentArea(value:IUIBase):void;
-
- // Viewport Position and Dimensions
-
- /**
- * The x position of the viewport space as allocated by the View.
- */
- function get viewportX():Number;
- function set viewportX(value:Number):void;
-
- /**
- * The y position of the viewport space as allocated by the View.
- */
- function get viewportY():Number;
- function set viewportY(value:Number):void;
-
- /**
- * The width of the viewport space as allocated by the View.
- */
- function get viewportWidth():Number;
- function set viewportWidth(value:Number):void;
-
- /**
- * The height of the viewport space as allocated by the View.
- */
- function get viewportHeight():Number;
- function set viewportHeight(value:Number):void;
-
- // Content Area Size and Position
-
- /**
- * The position of the content area within the viewport. This may
- * be an offset from the viewportX due to padding.
- */
- function get contentX():Number;
- function set contentX(value:Number):void;
-
/**
- * The position of the content area within the viewport. This may
- * be an offset from the viewportY due to padding.
- */
- function get contentY():Number;
- function set contentY(value:Number):void;
-
- /**
- * The width of the content area within the viewport. The width is
- * determined by the content itself, mostly due to the use of
- * a layout.
- */
- function get contentWidth():Number;
- function set contentWidth(value:Number):void;
-
- /**
- * The height of the content area within the viewport. The height
- * is determined by the content itself, mostly due to the use of
- * a layout.
- */
- function get contentHeight():Number;
- function set contentHeight(value:Number):void;
-
- // Scrolling Parameters
-
- /**
- * The top position of the content area that is visible in the viewport.
- */
- function get verticalScrollPosition():Number;
- function set verticalScrollPosition(value:Number):void;
-
- /**
- * The left position of the content area that is visible in the viewport.
- */
- function get horizontalScrollPosition():Number;
- function set horizontalScrollPosition(value:Number):void;
+ * Size of the borders.
+ */
+ function get borderMetrics():Rectangle;
+ function set borderMetrics(value:Rectangle):void;
+
+ /**
+ * Size of the chrome. A plain container doesn't have any chrome
+ * but a Panel's TitleBar and any ControlBar or StatusBar is
+ * considered chrome. Scrollbars used to scroll content are
+ * not factored into the viewport calculation. The Viewport
+ * is responsible for displaying any scrolling controls and
+ * deciding whether to further shrink the content area or
+ * have the scrollbars overlay the content.
+ */
+ function get chromeMetrics():Rectangle;
+ function set chromeMetrics(value:Rectangle):void;
+
}
-}
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
index 0c1a614,23eec41..b567300
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
@@@ -164,5 -163,20 +164,20 @@@ package org.apache.flex.cor
return JSON.parse("{" + value + "}");
}
+ /**
+ * @copy org.apache.flex.core.IValuesImpl#addRule()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function addRule(ruleName:String, values:Object):void
+ {
+ // ignore ruleName since all values are global
+ for (var p:String in values)
+ values[p] = values[p];
+ }
+
}
-}
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/basic-manifest.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/basic-manifest.xml
index 2da70e8,97a664b..6eb5ae0
--- a/frameworks/projects/Core/basic-manifest.xml
+++ b/frameworks/projects/Core/basic-manifest.xml
@@@ -22,7 -22,8 +22,9 @@@
<componentPackage>
<component id="Application" class="org.apache.flex.core.Application"/>
+ <!-- temporarily remove these classes while we try to get Application to compile
+ <component id="BrowserScroller" class="org.apache.flex.core.BrowserScroller"/>
+ <component id="BrowserResizeHandler" class="org.apache.flex.core.BrowserResizeListener"/>
<component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/>
<component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
<component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/compile-asjs-config.xml
----------------------------------------------------------------------
[31/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Found a couple of errors in ContainerBase's getElementIndex code on both AS
and JS side.
Posted by ah...@apache.org.
Found a couple of errors in ContainerBase's getElementIndex code on both AS and JS side.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f760bb42
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f760bb42
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f760bb42
Branch: refs/heads/core_js_to_as
Commit: f760bb42f1274ff5a9e94c5b272bac8ab3039918
Parents: e28d38e
Author: Peter Ent <pe...@apache.org>
Authored: Mon Sep 21 11:06:59 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Sep 21 11:06:59 2015 -0400
----------------------------------------------------------------------
.../projects/Core/as/src/org/apache/flex/core/ContainerBase.as | 2 +-
.../projects/Core/js/src/org/apache/flex/core/ContainerBase.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f760bb42/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
index 0d8005a..050f018 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
@@ -106,7 +106,7 @@ package org.apache.flex.core
*/
override public function getElementIndex(c:Object):int
{
- var contentView:IContentViewHost = view as IContentViewHost;
+ var contentView:IParent = view as IParent;
if (contentView != null) {
return contentView.getElementIndex(c);
} else {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f760bb42/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
index 4de63f6..593a11c 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
@@ -228,7 +228,7 @@ org.apache.flex.core.ContainerBase.prototype.removeElement = function(c, opt_dis
org.apache.flex.core.ContainerBase.prototype.getElementIndex = function(c) {
var contentView = this.view;
if (contentView != null) {
- return contentView(c);
+ return contentView.getElementIndex(c);
} else {
return this.$getElementIndex(c);
}
[38/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
- Fixed a bug in the deploy part of the asjs maven sctipts
Posted by ah...@apache.org.
- Fixed a bug in the deploy part of the asjs maven sctipts
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/40c4c14f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/40c4c14f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/40c4c14f
Branch: refs/heads/core_js_to_as
Commit: 40c4c14fe0e6115d75546194369f53f64bef2384
Parents: 2b3a0c0
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 22 23:14:54 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 22 23:14:54 2015 +0200
----------------------------------------------------------------------
maven.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/40c4c14f/maven.xml
----------------------------------------------------------------------
diff --git a/maven.xml b/maven.xml
index c9818b5..2be15e9 100644
--- a/maven.xml
+++ b/maven.xml
@@ -441,11 +441,11 @@
<target name="-deploy-maven-framework-config-artifact" depends="-setup-aether-antlib"
xmlns:artifact="antlib:org.eclipse.aether.ant">
<echo message="Deploying Framework config"/>
- <artifact:install>
+ <artifact:deploy>
<artifact:remoterepo id="${maven.repositoryId}" url="${maven.repositoryUrl}"/>
<artifact:pom file="generated/maven/flexjs-framework-framework.pom"/>
<artifact:artifact file="generated/maven/flexjs-framework-framework-configs.zip" classifier="configs"/>
- </artifact:install>
+ </artifact:deploy>
</target>
<target name="-deploy-maven-artifact-file" depends="-setup-aether-antlib"
[40/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Added missing statement to UIBase to set the view bead backing var. Moved
dispatch children notice in PanelView to proper location.
Posted by ah...@apache.org.
Added missing statement to UIBase to set the view bead backing var. Moved dispatch children notice in PanelView to proper location.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4dd82dbb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4dd82dbb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4dd82dbb
Branch: refs/heads/core_js_to_as
Commit: 4dd82dbb0390bb26d399a2dfaaa9322e4b9d910a
Parents: 996daef
Author: Peter Ent <pe...@apache.org>
Authored: Wed Sep 23 14:41:26 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Sep 23 14:41:26 2015 -0400
----------------------------------------------------------------------
frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js | 1 +
frameworks/projects/HTML/js/src/org/apache/flex/html/Panel.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4dd82dbb/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
index f00bb51..f79061d 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
@@ -348,6 +348,7 @@ org.apache.flex.core.UIBase.prototype.addBead = function(bead) {
this.model_ = bead;
if (org.apache.flex.utils.Language.is(bead, org.apache.flex.core.IBeadView)) {
+ this.view_ = bead;
this.dispatchEvent(new org.apache.flex.events.Event('viewChanged'));
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4dd82dbb/frameworks/projects/HTML/js/src/org/apache/flex/html/Panel.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/Panel.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/Panel.js
index 6090a64..e05c0e5 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/Panel.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/Panel.js
@@ -54,9 +54,9 @@ org.apache.flex.html.Panel.prototype.addElement = function(c) {
}
else {
this.contentArea.appendChild(c.element);
- this.dispatchEvent('childrenAdded');
}
c.addedToParent();
+ this.dispatchEvent('childrenAdded');
};*/
[45/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
rename jsc scripts to asjsc
Posted by ah...@apache.org.
rename jsc scripts to asjsc
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0bbba3e5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0bbba3e5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0bbba3e5
Branch: refs/heads/core_js_to_as
Commit: 0bbba3e58553b463e35608330ec42501d4157b17
Parents: 33016bb
Author: Alex Harui <ah...@apache.org>
Authored: Sat Sep 26 23:07:26 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Sep 26 23:07:26 2015 -0700
----------------------------------------------------------------------
.../projects/Binding/compile-asjs-config.xml | 2 +-
.../projects/Charts/compile-asjs-config.xml | 2 +-
.../Collections/compile-asjs-config.xml | 2 +-
.../projects/Core/compile-asjs-config.xml | 2 +-
.../projects/DragDrop/compile-asjs-config.xml | 2 +-
.../projects/Effects/compile-asjs-config.xml | 2 +-
.../projects/Formatters/compile-asjs-config.xml | 2 +-
.../projects/HTML/compile-asjs-config.xml | 2 +-
.../projects/Mobile/compile-asjs-config.xml | 2 +-
installer.xml | 4 +-
js/bin/asjsc | 70 ++++++++++++++++++++
js/bin/asjsc.bat | 29 ++++++++
js/bin/asjscompc | 70 ++++++++++++++++++++
js/bin/asjscompc.bat | 29 ++++++++
js/bin/compcjsc | 70 --------------------
js/bin/compcjsc.bat | 29 --------
js/bin/jsc | 70 --------------------
js/bin/jsc.bat | 29 --------
18 files changed, 209 insertions(+), 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/Binding/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/compile-asjs-config.xml b/frameworks/projects/Binding/compile-asjs-config.xml
index c7bd631..8a0395b 100644
--- a/frameworks/projects/Binding/compile-asjs-config.xml
+++ b/frameworks/projects/Binding/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/Charts/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/compile-asjs-config.xml b/frameworks/projects/Charts/compile-asjs-config.xml
index b63a50c..19ab3bd 100644
--- a/frameworks/projects/Charts/compile-asjs-config.xml
+++ b/frameworks/projects/Charts/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/Collections/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/compile-asjs-config.xml b/frameworks/projects/Collections/compile-asjs-config.xml
index 57fd3af..48d7dc0 100644
--- a/frameworks/projects/Collections/compile-asjs-config.xml
+++ b/frameworks/projects/Collections/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/Core/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-asjs-config.xml b/frameworks/projects/Core/compile-asjs-config.xml
index 9b093c0..a37a163 100644
--- a/frameworks/projects/Core/compile-asjs-config.xml
+++ b/frameworks/projects/Core/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/DragDrop/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/compile-asjs-config.xml b/frameworks/projects/DragDrop/compile-asjs-config.xml
index 6b632d4..3fcabd6 100644
--- a/frameworks/projects/DragDrop/compile-asjs-config.xml
+++ b/frameworks/projects/DragDrop/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/Effects/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/compile-asjs-config.xml b/frameworks/projects/Effects/compile-asjs-config.xml
index 8fd6a6c..1131fa7 100644
--- a/frameworks/projects/Effects/compile-asjs-config.xml
+++ b/frameworks/projects/Effects/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/Formatters/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/compile-asjs-config.xml b/frameworks/projects/Formatters/compile-asjs-config.xml
index 8f8c841..d688c63 100644
--- a/frameworks/projects/Formatters/compile-asjs-config.xml
+++ b/frameworks/projects/Formatters/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/HTML/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/compile-asjs-config.xml b/frameworks/projects/HTML/compile-asjs-config.xml
index 93560c6..c0379f3 100644
--- a/frameworks/projects/HTML/compile-asjs-config.xml
+++ b/frameworks/projects/HTML/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Binding.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/frameworks/projects/Mobile/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/compile-asjs-config.xml b/frameworks/projects/Mobile/compile-asjs-config.xml
index 9a885c8..043394b 100644
--- a/frameworks/projects/Mobile/compile-asjs-config.xml
+++ b/frameworks/projects/Mobile/compile-asjs-config.xml
@@ -43,7 +43,7 @@
<locale/>
<library-path>
- <!-- compjsc won't 'link' these classes in, but will list their requires
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index bd0427c..0906ced 100644
--- a/installer.xml
+++ b/installer.xml
@@ -321,11 +321,11 @@
</exec>
<exec executable="chmod" dir="${FLEXJS_HOME}">
<arg value="+x" />
- <arg value="${FLEXJS_HOME}/js/bin/jsc"/>
+ <arg value="${FLEXJS_HOME}/js/bin/asjsc"/>
</exec>
<exec executable="chmod" dir="${FLEXJS_HOME}">
<arg value="+x" />
- <arg value="${FLEXJS_HOME}/js/bin/compcjsc"/>
+ <arg value="${FLEXJS_HOME}/js/bin/asjscompc"/>
</exec>
<exec executable="chmod" dir="${FLEXJS_HOME}">
<arg value="+x" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/asjsc
----------------------------------------------------------------------
diff --git a/js/bin/asjsc b/js/bin/asjsc
new file mode 100755
index 0000000..3270f31
--- /dev/null
+++ b/js/bin/asjsc
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+
+#
+# mxmlc shell script to launch falcon-mxmlc.jar on OSX, Unix, or Cygwin.
+# In Windows Command Prompt, use mxmlc.bat instead.
+#
+
+SCRIPT_HOME=`dirname $0`
+if [ "x${FALCON_HOME}" = "x" ]
+then
+ FALCON_HOME=${SCRIPT_HOME}/../..
+fi
+
+echo Using Falcon codebase: $FALCON_HOME
+
+if [ "x${FLEX_HOME}" = "x" ]
+then
+ FLEX_HOME=${SCRIPT_HOME}/../..
+fi
+echo Using Flex SDK: $FLEX_HOME
+
+case `uname` in
+ CYGWIN*)
+ OS="Windows"
+ ;;
+ *)
+ OS=Unix
+esac
+
+D32=''
+
+if [ $OS = "Windows" ]; then
+
+ FALCON_HOME=`cygpath -m $FALCON_HOME`
+ FLEX_HOME=`cygpath -m $FLEX_HOME`
+
+elif [ $OS = "Unix" ]; then
+
+ check64="`java -version 2>&1 | grep -i 64-Bit`"
+ isOSX="`uname | grep -i Darwin`"
+ javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+
+ if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+ D32='-d32'
+ fi
+fi
+
+VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
+
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=jsc -external-library-path="$SCRIPT_HOME/../libs/js.swc" "$@"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/asjsc.bat
----------------------------------------------------------------------
diff --git a/js/bin/asjsc.bat b/js/bin/asjsc.bat
new file mode 100644
index 0000000..0df6851
--- /dev/null
+++ b/js/bin/asjsc.bat
@@ -0,0 +1,29 @@
+@echo off
+
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+rem
+rem mxmlc.bat script to launch falcon-mxmlc.jar in Windows Command Prompt.
+rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
+rem
+
+if "x%FALCON_HOME%"=="x" (set "FALCON_HOME=%~dp0..\..") else echo Using Falcon codebase: %FALCON_HOME%
+
+if "x%FLEX_HOME%"=="x" (set "FLEX_HOME=%~dp0..\..") else echo Using Flex SDK: %FLEX_HOME%
+
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\mxmlc.jar" -js-output-type=jsc -external-library-path="%FLEX_HOME%\js\libs\js.swc" %*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/asjscompc
----------------------------------------------------------------------
diff --git a/js/bin/asjscompc b/js/bin/asjscompc
new file mode 100755
index 0000000..7fd0cb0
--- /dev/null
+++ b/js/bin/asjscompc
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+
+#
+# mxmlc shell script to launch falcon-mxmlc.jar on OSX, Unix, or Cygwin.
+# In Windows Command Prompt, use mxmlc.bat instead.
+#
+
+if [ "x${FALCON_HOME}" = "x" ]
+then
+ SCRIPT_HOME=`dirname $0`
+ FALCON_HOME=${SCRIPT_HOME}/../..
+fi
+
+echo Using Falcon codebase: $FALCON_HOME
+
+if [ "x${FLEX_HOME}" = "x" ]
+then
+ FLEX_HOME=${SCRIPT_HOME}/../..
+fi
+echo Using Flex SDK: $FLEX_HOME
+
+case `uname` in
+ CYGWIN*)
+ OS="Windows"
+ ;;
+ *)
+ OS=Unix
+esac
+
+D32=''
+
+if [ $OS = "Windows" ]; then
+
+ FALCON_HOME=`cygpath -m $FALCON_HOME`
+ FLEX_HOME=`cygpath -m $FLEX_HOME`
+
+elif [ $OS = "Unix" ]; then
+
+ check64="`java -version 2>&1 | grep -i 64-Bit`"
+ isOSX="`uname | grep -i Darwin`"
+ javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+
+ if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+ D32='-d32'
+ fi
+fi
+
+VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
+
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=jsc -external-library-path="$SCRIPT_HOME/../libs/js.swc" "$@"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/asjscompc.bat
----------------------------------------------------------------------
diff --git a/js/bin/asjscompc.bat b/js/bin/asjscompc.bat
new file mode 100644
index 0000000..a9ea897
--- /dev/null
+++ b/js/bin/asjscompc.bat
@@ -0,0 +1,29 @@
+@echo off
+
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+rem
+rem compc.bat script to launch falcon-compc.jar in Windows Command Prompt.
+rem On OSX, Unix, or Cygwin, use the compc shell script instead.
+rem
+
+if "x%FALCON_HOME%"=="x" (set "FALCON_HOME=%~dp0..\..") else echo Using Falcon codebase: %FALCON_HOME%
+
+if "x%FLEX_HOME%"=="x" (set "FLEX_HOME=%~dp0..\..") else echo Using Flex SDK: %FLEX_HOME%
+
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\compc.jar" -js-output-type=jsc -external-library-path="%FLEX_HOME%\js\libs\js.swc" %*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/compcjsc
----------------------------------------------------------------------
diff --git a/js/bin/compcjsc b/js/bin/compcjsc
deleted file mode 100755
index 7fd0cb0..0000000
--- a/js/bin/compcjsc
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-################################################################################
-##
-## 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.
-##
-################################################################################
-
-
-#
-# mxmlc shell script to launch falcon-mxmlc.jar on OSX, Unix, or Cygwin.
-# In Windows Command Prompt, use mxmlc.bat instead.
-#
-
-if [ "x${FALCON_HOME}" = "x" ]
-then
- SCRIPT_HOME=`dirname $0`
- FALCON_HOME=${SCRIPT_HOME}/../..
-fi
-
-echo Using Falcon codebase: $FALCON_HOME
-
-if [ "x${FLEX_HOME}" = "x" ]
-then
- FLEX_HOME=${SCRIPT_HOME}/../..
-fi
-echo Using Flex SDK: $FLEX_HOME
-
-case `uname` in
- CYGWIN*)
- OS="Windows"
- ;;
- *)
- OS=Unix
-esac
-
-D32=''
-
-if [ $OS = "Windows" ]; then
-
- FALCON_HOME=`cygpath -m $FALCON_HOME`
- FLEX_HOME=`cygpath -m $FLEX_HOME`
-
-elif [ $OS = "Unix" ]; then
-
- check64="`java -version 2>&1 | grep -i 64-Bit`"
- isOSX="`uname | grep -i Darwin`"
- javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
-
- if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
- D32='-d32'
- fi
-fi
-
-VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=jsc -external-library-path="$SCRIPT_HOME/../libs/js.swc" "$@"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/compcjsc.bat
----------------------------------------------------------------------
diff --git a/js/bin/compcjsc.bat b/js/bin/compcjsc.bat
deleted file mode 100644
index a9ea897..0000000
--- a/js/bin/compcjsc.bat
+++ /dev/null
@@ -1,29 +0,0 @@
-@echo off
-
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem
-rem compc.bat script to launch falcon-compc.jar in Windows Command Prompt.
-rem On OSX, Unix, or Cygwin, use the compc shell script instead.
-rem
-
-if "x%FALCON_HOME%"=="x" (set "FALCON_HOME=%~dp0..\..") else echo Using Falcon codebase: %FALCON_HOME%
-
-if "x%FLEX_HOME%"=="x" (set "FLEX_HOME=%~dp0..\..") else echo Using Flex SDK: %FLEX_HOME%
-
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\compc.jar" -js-output-type=jsc -external-library-path="%FLEX_HOME%\js\libs\js.swc" %*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/jsc
----------------------------------------------------------------------
diff --git a/js/bin/jsc b/js/bin/jsc
deleted file mode 100755
index 3270f31..0000000
--- a/js/bin/jsc
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-################################################################################
-##
-## 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.
-##
-################################################################################
-
-
-#
-# mxmlc shell script to launch falcon-mxmlc.jar on OSX, Unix, or Cygwin.
-# In Windows Command Prompt, use mxmlc.bat instead.
-#
-
-SCRIPT_HOME=`dirname $0`
-if [ "x${FALCON_HOME}" = "x" ]
-then
- FALCON_HOME=${SCRIPT_HOME}/../..
-fi
-
-echo Using Falcon codebase: $FALCON_HOME
-
-if [ "x${FLEX_HOME}" = "x" ]
-then
- FLEX_HOME=${SCRIPT_HOME}/../..
-fi
-echo Using Flex SDK: $FLEX_HOME
-
-case `uname` in
- CYGWIN*)
- OS="Windows"
- ;;
- *)
- OS=Unix
-esac
-
-D32=''
-
-if [ $OS = "Windows" ]; then
-
- FALCON_HOME=`cygpath -m $FALCON_HOME`
- FLEX_HOME=`cygpath -m $FLEX_HOME`
-
-elif [ $OS = "Unix" ]; then
-
- check64="`java -version 2>&1 | grep -i 64-Bit`"
- isOSX="`uname | grep -i Darwin`"
- javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
-
- if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
- D32='-d32'
- fi
-fi
-
-VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=jsc -external-library-path="$SCRIPT_HOME/../libs/js.swc" "$@"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bbba3e5/js/bin/jsc.bat
----------------------------------------------------------------------
diff --git a/js/bin/jsc.bat b/js/bin/jsc.bat
deleted file mode 100644
index 0df6851..0000000
--- a/js/bin/jsc.bat
+++ /dev/null
@@ -1,29 +0,0 @@
-@echo off
-
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-rem
-rem mxmlc.bat script to launch falcon-mxmlc.jar in Windows Command Prompt.
-rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
-rem
-
-if "x%FALCON_HOME%"=="x" (set "FALCON_HOME=%~dp0..\..") else echo Using Falcon codebase: %FALCON_HOME%
-
-if "x%FLEX_HOME%"=="x" (set "FLEX_HOME=%~dp0..\..") else echo Using Flex SDK: %FLEX_HOME%
-
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\mxmlc.jar" -js-output-type=jsc -external-library-path="%FLEX_HOME%\js\libs\js.swc" %*
\ No newline at end of file
[14/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
use map coords from a public domain source
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/99418023/examples/native/USStatesMap/src/MapCoords.as
----------------------------------------------------------------------
diff --git a/examples/native/USStatesMap/src/MapCoords.as b/examples/native/USStatesMap/src/MapCoords.as
index 639282a..4cf953d 100644
--- a/examples/native/USStatesMap/src/MapCoords.as
+++ b/examples/native/USStatesMap/src/MapCoords.as
@@ -21,55 +21,55 @@ package
public class MapCoords
{
public var usmap:Object = {
- hi:"M233,519.3L235,515.7L237.2,515.4L237.6,516.2L235.5,519.3L233,519.3zM243.2,515.5L249.4,518.1L251.5,517.8L253.1,513.9L252.4,510.5L248.2,510L244.2,511.8L243.2,515.5zM273.9,525.6L277.7,531.1L280.1,530.7L281.2,530.3L282.7,531.5L286.4,531.4L287.4,529.9L284.4,528.2L282.5,524.4L280.4,520.9L274.6,523.8L273.9,525.6zM294.1,534.5L295.4,532.5L300.1,533.5L300.8,533L306.9,533.6L306.6,534.9L304,536.4L299.6,536.1L294.1,534.5zM299.5,539.6L301.4,543.5L304.5,542.4L304.8,540.8L303.2,538.7L299.5,538.3L299.5,539.6zM306.4,538.5L308.7,535.6L313.4,538L317.7,539.1L322.1,541.9L322.1,543.8L318.6,545.6L313.7,546.6L311.3,545.1L306.4,538.5zM323.1,554L324.7,552.7L328.1,554.3L335.7,557.9L339.1,560L340.7,562.4L342.6,566.8L346.7,569.4L346.4,570.7L342.5,573.9L338.3,575.4L336.8,574.7L333.8,576.5L331.3,579.7L329.1,582.6L327.3,582.5L323.7,579.9L323.4,575.4L324.1,572.9L322.4,567.3L320.3,565.5L320.2,562.9L322.4,561.9L324.5,558.9L325,557.9L323.4,556.1L323.1,554z",
- ak:"M158,453.6L157.7,539L159.3,540L162.4,540.1L163.8,539L166.4,539L166.6,541.9L173.5,548.7L174,551.3L177.4,549.3L178.1,549.2L178.4,546.1L179.9,544.5L181,544.3L182.9,542.9L186,545L186.6,547.9L188.6,549L189.7,551.4L193.6,553.2L197,559.2L199.7,563.1L202,565.8L203.5,569.5L208.5,571.3L213.6,573.4L214.6,577.8L215.1,580.9L214.1,584.2L212.3,586.5L210.7,585.7L209.3,582.6L206.5,581.2L204.7,580L203.9,580.9L205.4,583.6L205.6,587.3L204.4,587.8L202.5,585.9L200.4,584.6L200.9,586.2L202.2,588L201.4,588.8 C 201.4,588.8 200.5,588.5 200.1,587.8 C 199.6,587.2 198,584.4 198,584.4L197,582.1 C 197,582.1 196.7,583.4 196,583.1 C 195.4,582.8 194.7,581.7 194.7,581.7L196.5,579.7L195,578.3L195,573.3L194.2,573.3L193.4,576.6L192.3,577.1L191.3,573.4L190.7,569.7L189.9,569.2L190.2,574.9L190.2,576L188.7,574.7L185.2,568.7L183.1,568.2L182.4,564.5L180.8,561.6L179.2,560.5L179.2,558.2L181.3,556.9L180.8,556.6L178.2,557.2L174.8,554.8L172.3,551.9L167.4,549.3L163.4,546.7L164.7,543.5L164.7,541.9L162.9,543.5L160,544.6L156.2,5
43.5L150.6,541.1L145.1,541.1L144.4,541.6L138,537.7L135.9,537.4L133.1,531.5L129.6,531.9L126,533.3L126.5,537.9L127.6,534.9L128.6,535.3L127.1,539.6L130.4,536.9L131,538.5L127.1,542.9L125.9,542.5L125.4,540.6L124.1,539.8L122.8,540.9L120,539.1L117,541.2L115.2,543.3L111.8,545.4L107.1,545.3L106.6,543.2L110.3,542.5L110.3,541.2L108.1,540.6L109,538.2L111.3,534.3L111.3,532.5L111.5,531.7L115.8,529.4L116.8,530.7L119.6,530.7L118.3,528.2L114.5,527.8L109.5,530.6L107.1,534L105.3,536.6L104.2,538.8L100,540.3L96.9,542.9L96.6,544.5L98.9,545.4L99.7,547.6L96.9,550.8L90.5,555L82.7,559.2L80.6,560.3L75.3,561.5L69.9,563.7L71.7,565L70.2,566.5L69.8,567.6L67,566.6L63.8,566.8L63,569.1L62,569.1L62.3,566.6L58.8,567.9L55.9,568.9L52.5,567.6L49.6,569.5L46.3,569.5L44.2,570.8L42.6,571.6L40.5,571.3L37.9,570.2L35.6,570.8L34.7,571.8L33.1,570.7L33.1,568.7L36.1,567.4L42.4,568.1L46.8,566.5L48.9,564.4L51.8,563.7L53.6,562.9L56.3,563.1L58,564.4L58.9,564L61.2,561.3L64.3,560.3L67.7,559.7L69,559.4L69.6,559.8L70.4,559.8L71.7,556.1L75.
7,554.7L77.7,550.9L79.9,546.4L81.6,545L81.9,542.4L80.3,543.7L76.9,544.3L76.2,541.9L74.9,541.6L74,542.5L73.8,545.4L72.3,545.3L70.9,539.5L69.6,540.8L68.5,540.3L68.1,538.3L64.1,538.5L62,539.6L59.4,539.3L60.9,537.9L61.4,535.3L60.7,533.3L62.2,532.4L63.5,532.2L62.8,530.4L62.8,526L61.8,525.1L61,526.5L54.9,526.5L53.4,525.2L52.8,521.4L50.7,517.8L50.7,516.8L52.8,516L52.9,513.9L54.1,512.8L53.3,512.3L52,512.8L50.8,510L51.8,505L56.3,501.8L58.9,500.2L60.9,496.5L63.6,495.2L66.2,496.3L66.5,498.7L69,498.4L72.2,496L73.8,496.6L74.8,497.3L76.4,497.3L78.7,496L79.5,491.6 C 79.5,491.6 79.8,488.7 80.4,488.2 C 81.1,487.7 81.4,487.3 81.4,487.3L80.3,485.3L77.7,486.1L74.4,486.9L72.5,486.4L69,484.7L63.9,484.5L60.4,480.8L60.9,476.9L61.5,474.5L59.4,472.7L57.5,469L58,468.2L64.7,467.7L66.8,467.7L67.8,468.7L68.5,468.7L68.3,467L72.2,466.4L74.8,466.7L76.2,467.9L74.8,470L74.3,471.4L77,473L82,474.8L83.8,473.8L81.6,469.5L80.6,466.2L81.6,465.4L78.2,463.5L77.7,462.4L78.2,460.7L77.4,456.9L74.4,452.2L72,448L74.9,446L78.2,446
L79.9,446.7L84.1,446.5L87.9,443L89,439.9L92.7,437.5L94.3,438.4L97.1,437.8L100.8,435.7L101.9,435.5L102.9,436.3L107.4,436.2L110.2,433.1L111.3,433.1L114.9,435.5L116.8,437.6L116.3,438.8L117,439.9L118.6,438.3L122.5,438.6L122.8,442.3L124.7,443.8L131.8,444.4L138.1,448.6L139.6,447.6L144.8,450.2L146.9,449.6L148.8,448.8L153.7,450.7L158,453.6zM42.9,482.6L45,487.9L44.9,488.9L42,488.5L40.2,484.5L38.4,483L36,483L35.8,480.5L37.6,478L38.7,480.5L40.2,481.9L42.9,482.6zM40.3,516L44.1,516.8L47.8,517.8L48.6,518.8L47,522.5L43.9,522.3L40.5,518.8L40.3,516zM19.6,502L20.8,504.5L21.9,506.2L20.8,507L18.7,503.9L18.7,502L19.6,502zM5.9,575L9.3,572.8L12.7,571.8L15.3,572.1L15.8,573.7L17.7,574.2L19.6,572.3L19.3,570.7L22.1,570L25,572.6L23.8,574.4L19.5,575.5L16.7,575L13,573.9L8.7,575.4L7,575.7L5.9,575zM54.9,570.5L56.5,572.4L58.6,570.8L57.2,569.5L54.9,570.5zM57.8,573.6L58.9,571.3L61,571.6L60.2,573.6L57.8,573.6zM81.4,571.6L82.9,573.4L83.8,572.3L83,570.3L81.4,571.6zM90.1,559.2L91.3,565L94.2,565.8L99.2,562.9L103.5,560.3L1
01.9,557.9L102.4,555.5L100.3,556.8L97.4,556L99,554.8L101,555.6L104.8,553.9L105.3,552.4L102.9,551.6L103.7,549.7L101,551.6L96.3,555.1L91.4,558.1L90.1,559.2zM132.5,539.3L134.9,537.9L133.9,536.1L132.2,537L132.5,539.3z",
- fl:"M759.8,439.1L762,446.4L765.8,456.2L771.1,465.5L774.8,471.8L779.7,477.3L783.7,481L785.3,484L784.2,485.3L783.4,486.5L786.3,494L789.2,496.9L791.8,502.2L795.3,508L799.9,516.3L801.2,523.9L801.7,535.9L802.3,537.6L802,541L799.5,542.3L799.9,544.3L799.2,546.2L799.5,548.6L800,550.6L797.3,553.8L794.2,555.3L790.3,555.4L788.9,557L786.5,558L785.2,557.5L784,556.5L783.7,553.6L782.9,550.2L779.5,545.1L775.9,542.8L772.1,542.5L771.3,543.8L768.2,539.4L767.5,535.9L765,531.8L763.2,530.7L761.6,532.8L759.8,532.5L757.7,527.4L754.8,523.6L751.9,518.2L749.3,515.2L745.7,511.4L747.8,509L751.1,503.5L750.9,501.9L746.4,500.9L744.7,501.6L745.1,502.2L747.7,503.2L746.2,507.7L745.4,508.2L743.6,504.2L742.3,499.3L742,496.6L743.5,491.9L743.5,482.3L740.4,478.6L739.1,475.6L733.9,474.3L732,473.6L730.4,471L727,469.4L725.8,466L723.1,465L720.7,461.3L716.5,459.9L713.5,458.4L711,458.4L706.9,459.2L706.8,461.2L707.6,462.1L707.1,463.3L704,463.1L700.3,466.7L696.7,468.6L692.9,468.6L689.6,469.9L689.3,467.1L687.7,465.2L684.8,464.1
L683.2,462.6L675.1,458.7L667.5,457L663.1,457.6L657.1,458.1L651.1,460.2L647.7,460.8L647.4,452.8L644.8,450.8L643.1,449L643.4,446L653.6,444.7L679.1,441.8L685.9,441.1L691.3,441.4L693.9,445.3L695.4,446.7L703.5,447.2L714.3,446.6L735.8,445.3L741.3,444.6L746.4,444.8L746.8,447.7L749,448.6L749.3,443.9L747.7,439.8L749,438.3L754.6,438.8L759.8,439.1zM772.3,571.5L774.7,570.9L776,570.6L777.5,568.3L779.8,566.6L781.1,567.1L782.8,567.5L783.2,568.5L779.7,569.7L775.5,571.2L773.2,572.4L772.3,571.5zM785.8,566.5L787,567.5L789.8,565.4L795.1,561.2L798.8,557.4L801.3,550.7L802.3,549L802.5,545.6L801.7,546.1L800.8,548.9L799.3,553.6L796.1,558.8L791.7,563L788.3,565L785.8,566.5z",
- nh:"M880.7,142.4L881.6,141.3L882.7,138L880.2,137.1L879.7,134L875.8,132.9L875.5,130.1L868.2,106.7L863.6,92.2L862.7,92.2L862.1,93.8L861.4,93.3L860.4,92.3L859,94.3L858.9,99.3L859.2,105L861.2,107.7L861.2,111.7L857.5,116.8L854.9,117.9L854.9,119.1L856,120.8L856,129.4L855.2,138.6L855,143.5L856,144.8L855.9,149.3L855.4,151.1L856.3,151.8L873.1,147.4L875.3,146.8L877.1,144L880.7,142.4z",
- mi:"M581.61931,82.059006 L 583.4483,80.001402 L 585.62022,79.201221 L 590.99286,75.314624 L 593.27908,74.743065 L 593.73634,75.200319 L 588.59232,80.344339 L 585.27728,82.287628 L 583.21967,83.202124 L 581.61931,82.059006 z M 667.79369,114.18719 L 668.44033,116.69293 L 671.67355,116.85459 L 672.96684,115.64213 C 672.96684,115.64213 672.88601,114.18719 672.56269,114.02552 C 672.23936,113.86386 670.94608,112.16642 670.94608,112.16642 L 668.76366,112.40891 L 667.14704,112.57057 L 666.82372,113.7022 L 667.79369,114.18719 z M 567.49209,111.21318 L 568.20837,110.63278 L 570.9566,109.82447 L 574.51313,107.56123 L 574.51313,106.59126 L 575.15978,105.94462 L 581.14121,104.97466 L 583.56612,103.03473 L 587.93095,100.93315 L 588.09261,99.639864 L 590.03254,96.729975 L 591.8108,95.921673 L 593.10409,94.143408 L 595.36733,91.880161 L 599.73217,89.455254 L 604.42032,88.970273 L 605.55194,90.101896 L 605.22862,91.071859 L 601.51043,92.041822 L 600.05549,95.113371 L 597.79224,95.921673 L 597.307
26,98.34658 L 594.88235,101.57979 L 594.55903,104.16636 L 595.36733,104.65134 L 596.3373,103.51972 L 599.89383,100.60983 L 601.18711,101.90311 L 603.45036,101.90311 L 606.68357,102.87307 L 608.13851,104.0047 L 609.59345,107.07625 L 612.34168,109.82447 L 616.22153,109.66281 L 617.67648,108.69285 L 619.29308,109.98613 L 620.90969,110.47112 L 622.20297,109.66281 L 623.33459,109.66281 L 624.9512,108.69285 L 628.99271,105.13632 L 632.38758,104.0047 L 639.01566,103.68138 L 643.54215,101.74145 L 646.12872,100.44817 L 647.58367,100.60983 L 647.58367,106.26794 L 648.06865,106.59126 L 650.97853,107.39957 L 652.91846,106.91458 L 659.06156,105.29798 L 660.19318,104.16636 L 661.64813,104.65134 L 661.64813,111.60274 L 664.88134,114.67429 L 666.17462,115.32093 L 667.4679,116.29089 L 666.17462,116.61421 L 665.36632,116.29089 L 661.64813,115.80591 L 659.54654,116.45255 L 657.28329,116.29089 L 654.05008,117.74584 L 652.27182,117.74584 L 646.45204,116.45255 L 641.27891,116.61421 L 639.33898,119.20078
L 632.38758,119.84742 L 629.96267,120.65572 L 628.83105,123.72727 L 627.53777,124.8589 L 627.05279,124.69724 L 625.59784,123.08063 L 621.07135,125.50554 L 620.42471,125.50554 L 619.29308,123.88893 L 618.48478,124.05059 L 616.54486,128.41543 L 615.57489,132.45694 L 612.39377,139.45774 L 611.21701,138.42347 L 609.84527,137.39215 L 607.90449,127.10413 L 604.36001,125.73408 L 602.30743,123.44785 L 590.18707,120.70437 L 587.3318,119.67473 L 579.10138,117.50199 L 571.21139,116.35887 L 567.49209,111.21318 z,M697.8,177.2L694.6,168.9L692.3,159.9L689.9,156.7L687.3,154.9L685.7,156L681.8,157.8L679.9,162.8L677.1,166.5L676,167.2L674.5,166.5 C 674.5,166.5 671.9,165.1 672.1,164.4 C 672.3,163.8 672.6,159.4 672.6,159.4L676,158.1L676.8,154.7L677.4,152.1L679.9,150.5L679.5,140.5L677.9,138.2L676.6,137.4L675.8,135.3L676.6,134.5L678.2,134.8L678.4,133.2L676,131L674.7,128.4L672.1,128.4L667.6,126.9L662.1,123.5L659.3,123.5L658.7,124.2L657.7,123.7L654.6,121.4L651.7,123.2L648.8,125.5L649.2,129L650.1,129.3L652.2,
129.8L652.7,130.6L650.1,131.4L647.5,131.8L646.1,133.5L645.8,135.6L646.1,137.3L646.4,142.8L642.8,144.9L642.2,144.7L642.2,140.5L643.5,138.1L644.1,135.6L643.3,134.8L641.4,135.6L640.4,139.8L637.7,141L635.9,142.9L635.7,143.9L636.4,144.7L635.7,147.3L633.5,147.8L633.5,148.9L634.3,151.3L633.1,157.5L631.5,161.5L632.2,166.2L632.7,167.3L631.9,169.8L631.5,170.6L631.2,173.3L634.8,179.3L637.7,185.8L639.1,190.6L638.3,195.3L637.3,201.3L634.9,206.4L634.6,209.2L631.3,212.3L635.8,212.1L657.2,209.9L664.4,208.9L664.5,210.5L671.4,209.3L681.7,207.8L685.5,207.4L685.7,206.8L685.8,205.3L687.9,201.6L689.9,199.9L689.7,194.8L691.3,193.2L692.4,192.9L692.6,189.3L694.2,186.3L695.2,186.9L695.4,187.5L696.2,187.7L698.1,186.7L697.8,177.2z",
- me:"M922.8,78.8L924.7,80.9L927,84.6L927,86.5L924.9,91.2L923,91.9L919.6,94.9L914.7,100.4 C 914.7,100.4 914.1,100.4 913.4,100.4 C 912.8,100.4 912.4,98.3 912.4,98.3L910.7,98.5L909.7,100L907.3,101.4L906.3,102.9L907.9,104.3L907.4,105L906.9,107.7L905,107.6L905,105.9L904.7,104.6L903.2,105L901.5,101.7L899.3,103L900.6,104.5L901,105.6L900.2,106.9L900.5,110L900.6,111.6L899,114.2L896.1,114.7L895.8,117.6L890.5,120.7L889.2,121.1L887.5,119.7L884.5,123.2L885.4,126.5L884,127.8L883.8,132.1L882.7,138.4L880.2,137.2L879.8,134.2L875.9,133L875.6,130.3L868.3,106.8L863.6,92.2L865,92.1L866.5,92.5L866.5,89.9L867.8,85.4L870.4,80.7L871.9,76.7L869.9,74.3L869.9,68.3L870.7,67.3L871.5,64.6L871.4,63.1L871.2,58.2L873,53.4L875.9,44.5L878,40.3L879.3,40.3L880.6,40.5L880.6,41.6L881.9,43.9L884.6,44.5L885.4,43.7L885.4,42.7L889.5,39.8L891.3,38L892.7,38.2L898.7,40.6L900.6,41.6L909.7,71.5L915.7,71.5L916.5,73.4L916.6,78.3L919.6,80.6L920.4,80.6L920.5,80.1L920,78.9L922.8,78.8zM901.9,108.9L903.4,107.4L904.8,108.4L905.3,110.9L9
03.6,111.8L901.9,108.9zM908.6,103L910.3,104.9 C 910.3,104.9 911.6,105 911.6,104.6 C 911.6,104.3 911.9,102.6 911.9,102.6L912.8,101.8L912,100L909.9,100.8L908.6,103z",
- ri:"M874,178.8L870.3,163.9L876.6,162L878.8,164L882.1,168.3L884.8,172.7L881.8,174.3L880.5,174.2L879.4,175.9L876.9,177.9L874,178.8z",
- ny:"M830.3,188.7L829.2,187.7L826.6,187.6L824.3,185.6L822.7,179.5L819.3,179.6L816.8,176.9L797.4,181.3L754.4,190L746.9,191.2L746.2,184.7L747.6,183.6L748.9,182.5L749.9,180.9L751.6,179.7L753.6,178L754.1,176.3L756.2,173.6L757.3,172.6L757.1,171.7L755.8,168.6L754.1,168.4L752.1,162.3L755,160.5L759.4,159.1L763.4,157.8L766.7,157.3L773,157.1L774.9,158.4L776.5,158.6L778.6,157.3L781.2,156.1L786.4,155.7L788.5,153.9L790.3,150.6L791.9,148.7L794,148.7L795.9,147.6L796.1,145.3L794.6,143.2L794.3,141.8L795.4,139.7L795.4,138.2L793.7,138.2L791.9,137.4L791.1,136.3L790.9,133.7L796.7,128.2L797.4,127.4L798.8,124.5L801.7,119.9L804.5,116.2L806.6,113.8L809,112L812.1,110.7L817.6,109.4L820.8,109.6L825.3,108.1L832.9,106.1L833.4,111L835.9,117.5L836.7,122.7L835.7,126.6L838.3,131.1L839.1,133.2L838.3,136.1L841.2,137.4L841.8,137.7L844.9,148.7L844.4,153.8L843.9,164.6L844.7,170.1L845.5,173.6L847,180.9L847,189L845.8,191.3L847.7,193.3L848.5,194.9L846.5,196.7L846.8,198L848.1,197.7L849.6,196.4L851.9,193.8L853,193.2L854.6,1
93.8L856.9,194L864.8,190.1L867.7,187.3L869,185.9L873.2,187.5L869.8,191.1L865.9,194L858.8,199.3L856.2,200.3L850.4,202.2L846.4,203.3L845.2,202.8L844.9,199.1L845.4,196.4L845.3,194.3L842.5,192.6L837.9,191.6L834,190.5L830.3,188.7z",
- pa:"M825.1,224.6L826.4,224.4L828.7,223.1L829.9,220.6L831.5,218.4L834.8,215.3L834.8,214.5L832.3,212.9L828.8,210.5L827.8,207.9L825.1,207.5L824.9,206.4L824.1,203.7L826.4,202.5L826.5,200.1L825.2,198.8L825.4,197.2L827.3,194.1L827.3,191.1L830,188.4L829.1,187.7L826.6,187.5L824.3,185.6L822.7,179.5L819.2,179.6L816.8,176.9L798.7,181.1L755.7,189.8L746.8,191.3L746.2,184.7L740.8,189.8L739.5,190.3L735.3,193.3L738.2,212.4L740.7,222.2L744.3,241.4L747.6,240.8L759.5,239.3L797.4,231.6L812.3,228.8L820.6,227.2L820.9,226.9L823,225.3L825.1,224.6z",
- nj:"M829.6,188.4L827.3,191.1L827.3,194.2L825.4,197.3L825.2,198.9L826.5,200.2L826.3,202.6L824.1,203.8L824.9,206.5L825,207.6L827.8,208L828.8,210.5L832.3,213L834.7,214.6L834.7,215.4L831.8,218.1L830.1,220.4L828.7,223.1L826.4,224.4L826,226L825.7,227.2L825.1,229.8L826.2,232.1L829.4,235L834.3,237.2L838.3,237.9L838.5,239.3L837.7,240.3L838,243.1L838.8,243.1L840.9,240.6L841.7,235.8L844.5,231.7L847.5,225.3L848.7,219.8L848,218.6L847.9,209.3L846.2,205.9L845.1,206.7L842.4,207L841.9,206.5L843,205.5L845.1,203.6L845.2,202.5L844.8,199.1L845.4,196.3L845.3,194.4L842.4,192.6L837.4,191.4L833.2,190.1L829.6,188.4z",
- de:"M825.6,228.2L825.9,226.1L826.3,224.4L824.7,224.8L823.1,225.3L820.9,227L822.6,232.1L824.9,237.7L827,247.4L828.6,253.7L833.6,253.6L839.7,252.4L837.5,245L836.5,245.5L832.9,243.1L831.2,238.4L829.2,234.8L826.1,231.9L825.2,229.8L825.6,228.2z",
- md:"M839.7,252.4L833.7,253.6L828.6,253.7L826.7,246.8L824.8,237.6L822.2,231.4L821,227L813.5,228.6L798.6,231.5L761.1,239L762.3,244L763.2,249.7L763.6,249.4L765.7,246.9L767.9,244.3L770.3,243.7L771.8,242.2L773.6,239.7L774.9,240.3L777.8,240L780.4,237.9L782.4,236.4L784.2,235.9L785.9,237.1L788.8,238.5L790.7,240.3L791.9,241.8L796,243.5L796,246.4L801.5,247.7L802.7,248.3L804.1,246.2L807,248.2L805.7,250.7L804.9,254.7L803.2,257.3L803.2,259.4L803.8,261.2L808.9,262.5L813.2,262.4L816.3,263.4L818.4,263.7L819.3,261.6L817.9,259.5L817.9,257.8L815.4,255.7L813.3,250.2L814.6,244.8L814.5,242.7L813.2,241.4 C 813.2,241.4 814.6,239.8 814.6,239.2 C 814.6,238.5 815.1,237.1 815.1,237.1L817.1,235.8L819,234.2L819.5,235.1L818,236.7L816.7,240.5L817.1,241.6L818.8,241.9L819.3,247.4L817.2,248.4L817.5,251.9L818,251.8L819.2,249.8L820.8,251.6L819.2,252.9L818.8,256.3L821.4,259.7L825.3,260.2L826.9,259.4L830.2,263.6L831.5,264.1L838.2,261.3L840.2,257.3L839.7,252.4zM823.8,261.4L824.9,263.9L825.1,265.7L826.2,267.5 C 826.2,26
7.5 827.1,266.6 827.1,266.3 C 827.1,266 826.4,263.3 826.4,263.3L825.6,260.9L823.8,261.4z",
- va:"M831.6,266L831.4,264.1L837.9,261.5L837.1,264.7L834.2,268.5L833.8,273.1L834.3,276.5L832.4,281.5L830.3,283.4L828.8,278.7L829.2,273.3L830.8,269.1L831.6,266zM834.9,294.3L776.8,306.9L739.3,312.2L732.6,311.8L730.1,313.7L722.7,313.9L714.3,314.9L703.4,316.5L713.9,310.9L713.9,308.9L715.4,306.7L726,295.2L729.9,299.7L733.7,300.6L736.2,299.5L738.5,298.2L741,299.5L744.9,298.1L746.8,293.6L749.4,294.1L752.3,292L754.1,292.5L756.9,288.8L757.2,286.7L756.3,285.4L757.3,283.6L762.5,271.3L763.2,265.5L764.4,265L766.6,267.5L770.5,267.2L772.4,259.6L775.2,259L776.3,256.3L778.9,253.9L781.6,248.2L781.7,243.2L791.5,247 C 792.2,247.3 792.4,241.9 792.4,241.9L796,243.5L796.1,246.5L801.9,247.8L804,249L805.7,251L805,254.7L803.1,257.3L803.2,259.3L803.8,261.2L808.7,262.4L813.2,262.5L816.3,263.4L818.2,263.7L818.9,266.8L822.1,267.2L823,268.4L822.5,273.1L823.9,274.2L823.4,276.2L824.7,276.9L824.4,278.3L821.7,278.2L821.8,279.9L824.1,281.4L824.2,282.8L826,284.6L826.5,287.1L823.9,288.5L825.5,290L831.3,288.3L834.9,294.
3z",
- wv:"M761.1,238.9L762.2,243.9L763.3,249.9L765.5,247.3L767.7,244.2L770.3,243.6L771.7,242.2L773.5,239.6L774.9,240.2L777.9,239.9L780.4,237.8L782.4,236.4L784.3,235.9L785.6,236.9L789.2,238.7L791.2,240.5L792.6,241.8L791.8,247.3L786,244.8L781.7,243.2L781.6,248.3L778.9,253.9L776.3,256.3L775.1,259.1L772.5,259.6L771.6,263.2L770.6,267.1L766.6,267.5L764.3,265L763.2,265.6L762.6,271L761.2,274.6L756.2,285.5L757.1,286.7L756.9,288.6L754.1,292.5L752.3,291.9L749.4,294.1L746.8,293.5L744.8,298.1 C 744.8,298.1 741.6,299.5 740.9,299.5 C 740.7,299.4 738.4,298.2 738.4,298.2L736.1,299.6L733.7,300.6L729.9,299.7L728.8,298.6L726.6,295.5L723.5,293.6L721.8,289.9L717.5,286.5L716.8,284.2L714.2,282.7L713.4,281.1L713.2,275.9L715.4,275.8L717.3,275L717.5,272.2L719.1,270.8L719.3,265.8L720.2,261.9L721.5,261.2L722.8,262.4L723.3,264.2L725.1,263.2L725.6,261.6L724.4,259.8L724.4,257.4L725.4,256.1L727.7,252.7L729,251.2L731.1,251.7L733.3,250.1L736.4,246.7L738.7,242.8L739,237.2L739.5,232.1L739.5,227.5L738.3,224.4L739.3,222.9L7
40.6,221.6L744.1,241.5L748.7,240.7L761.1,238.9z",
- oh:"M735.3,193.3L729.2,197.3L725.3,199.6L721.9,203.3L717.9,207.2L714.6,208L711.7,208.5L706.2,211.1L704.1,211.2L700.7,208.2L695.6,208.8L693,207.4L690.6,206L685.7,206.7L675.5,208.3L664.3,210.5L665.6,225.1L667.4,238.9L670,262.3L670.5,267.2L674.7,267L677.1,266.2L680.4,267.7L682.5,272.1L687.6,272.1L689.5,274.2L691.3,274.1L693.8,272.8L696.3,273.1L701.8,273.6L703.5,271.5L705.8,270.2L707.9,269.5L708.6,272.3L710.3,273.2L713.8,275.6L716,275.5L717.3,275L717.5,272.3L719.1,270.8L719.2,266 C 719.2,266 720.2,261.9 720.2,261.9L721.5,261.3L722.8,262.4L723.4,264.1L725.1,263.1L725.5,261.6L724.4,259.7L724.5,257.4L725.2,256.4L727.4,253L728.4,251.5L730.5,252L732.8,250.4L735.9,247L738.6,242.9L739,237.8L739.4,232.8L739.3,227.5L738.3,224.6L738.7,223.4L740.5,221.7L738.2,212.6L735.3,193.3z",
- 'in':"M619.5,299.9L619.6,297.1L620.1,292.5L622.3,289.6L624.1,285.7L626.7,281.5L626.2,275.7L624.4,273L624.1,269.7L624.9,264.2L624.4,257.3L623.1,241.3L621.8,225.9L620.9,214.2L623.9,215.1L625.4,216.1L626.5,215.7L628.6,213.8L631.5,212.2L636.6,212L658.5,209.8L664.1,209.2L665.6,225.2L669.9,262L670.5,267.8L670.1,270.1L671.3,271.9L671.4,273.2L668.9,274.8L665.4,276.4L662.2,276.9L661.6,281.8L657,285.1L654.2,289.1L654.5,291.5L653.9,293L650.6,293L649,291.4L646.5,292.7L643.8,294.2L644,297.2L642.8,297.5L642.3,296.5L640.2,295L636.9,296.3L635.4,299.3L633.9,298.5L632.5,296.9L628,297.4L622.4,298.4L619.5,299.9z",
- il:"M619.5,300.3L619.5,297.1L620.1,292.4L622.4,289.5L624.3,285.4L626.5,281.4L626.2,276.2L624.1,272.6L624,269.3L624.7,264L623.9,256.8L622.9,241.1L621.6,226L620.6,214.4L620.4,213.5L619.6,210.9L618.3,207.2L616.6,205.4L615.2,202.8L615,197.3L569.2,199.9L569.4,202.3L571.7,203L572.6,204.1L573,206L576.9,209.4L577.6,211.7L576.9,215.1L575.1,218.8L574.4,221.3L572.1,223.1L570.3,223.8L565,225.2L564.4,227L563.7,229L564.4,230.4L566.2,232L566,236.1L564.1,237.7L563.4,239.3L563.4,242.1L561.6,242.5L560,243.7L559.8,245L560,247.1L558.3,248.4L557.3,251.2L557.7,254.9L560,262.2L567.3,269.7L572.8,273.4L572.6,277.7L573.5,279.1L579.9,279.6L582.6,280.9L582,284.6L579.7,290.5L579,293.7L581.3,297.6L587.7,302.9L592.3,303.6L594.3,308.6L596.4,311.8L595.5,314.8L597.1,318.9L598.9,321L600.3,320.1L601.2,318L603.4,316.2L605.5,315.6L608.2,316.8L611.8,318.2L613,317.9L613.2,315.6L611.9,313.2L612.2,310.8L614,309.5L617,308.7L618.3,308.2L617.7,306.8L616.9,304.5L618.3,303.5L619.5,300.3z",
- ct:"M874,178.8L870.3,163.9L865.6,164.9L844.4,169.6L845.4,172.8L846.8,180.1L847,189.1L845.8,191.2L847.7,193.2L852,189.3L855.6,186L857.5,183.9L858.3,184.6L861.1,183.1L866.2,182L874,178.8z",
- wi:"M615,197.3L614.9,194.2L613.8,189.6L613.1,183.5L612,181.1L613,178L613.8,175.1L615.2,172.5L614.6,169.1L613.9,165.5L614.4,163.8L616.4,161.3L616.5,158.6L615.7,157.3L616.4,154.7L615.9,150.5L618.7,144.9L621.6,138.1L621.7,135.8L621.4,134.9L620.6,135.3L616.4,141.7L613.6,145.7L611.7,147.5L610.9,149.7L608.9,150.5L607.8,152.5L606.4,152.2L606.2,150.4L607.5,148L609.6,143.3L611.4,141.7L612.4,139.3L609.8,137.4L607.8,127L604.3,125.7L602.3,123.4L590.2,120.7L587.3,119.6L579.1,117.5L571.2,116.3L567.4,111.2L566.7,111.7L565.5,111.6L564.8,110.4L563.5,110.7L562.4,110.9L560.6,111.9L559.6,111.2L560.3,109.3L562.2,106.2L563.3,105.1L561.4,103.6L559.3,104.4L556.4,106.4L548.9,109.6L546,110.3L543.1,109.8L542.1,108.9L540,111.7L539.8,114.5L539.8,122.9L538.7,124.5L533.4,128.4L531.1,134.4L531.6,134.6L534.1,136.7L534.8,139.9L532.9,143.1L532.9,146.9L533.4,153.6L536.4,156.5L539.8,156.5L541.6,159.7L545.1,160.2L548.9,165.9L556,170L558.1,172.8L559,180.2L559.7,183.5L562,185.1L562.2,186.5L560.1,189.9L560.4,193.1L562.9
,197L565.4,198.2L568.4,198.6L569.7,200L615,197.3z",
- nc:"M834.9,294.3L837,299.2L840.6,305.6L843,308.1L843.6,310.3L841.2,310.5L842,311.1L841.7,315.3L839.1,316.6L838.5,318.7L837.2,321.7L833.5,323.3L831,322.9L829.6,322.8L828,321.5L828.3,322.8L828.3,323.8L830.2,323.8L831,325L829.1,331.4L833.3,331.4L833.9,333L836.2,330.7L837.5,330.2L835.6,333.8L832.5,338.6L831.2,338.6L830.1,338.1L827.3,338.8L822.1,341.2L815.7,346.5L812.3,351.2L810.3,357.7L809.9,360.1L805.2,360.6L799.7,362L789.8,353.7L777.2,346.1L774.3,345.3L761.6,346.8L757.4,347.5L755.7,344.3L752.8,342.2L736.3,342.7L729,343.5L720,348L713.8,350.6L692.6,353.2L693.1,349.1L694.9,347.7L697.7,347L698.3,343.3L702.5,340.6L706.4,339.1L710.6,335.6L715,333.5L715.6,330.4L719.5,326.5L720.1,326.3 C 720.1,326.3 720.1,327.5 720.9,327.5 C 721.8,327.5 722.9,327.8 722.9,327.8L725.1,324.2L727.3,323.6L729.5,323.9L731.1,320.4L734,317.8L734.5,315.7L734.7,312L739,312L746.2,311.1L761.9,308.9L777.1,306.8L798.7,302.1L818.7,297.8L829.9,295.4L834.9,294.3zM839.2,327.5L841.8,325L844.9,322.4L846.5,321.7L846.6,319.7L84
6,313.6L844.5,311.2L843.9,309.4L844.6,309.1L847.4,314.6L847.8,319.1L847.6,322.5L844.2,324L841.4,326.4L840.3,327.6L839.2,327.5z",
- dc:"M805.8,250.8L803.9,249L802.7,248.3L804.1,246.3L807,248.2L805.8,250.8z",
- ma:"M899.6,173.2L901.7,172.5L902.2,170.8L903.2,170.9L904.3,173.2L903,173.7L899.1,173.8L899.6,173.2zM890.2,174L892.5,171.4L894.1,171.4L895.9,172.9L893.5,173.9L891.3,174.9L890.2,174zM855.4,152L873,147.4L875.3,146.7L877.2,143.9L881,142.3L883.9,146.7L881.4,151.9L881.1,153.3L883,155.9L884.2,155.1L886,155.1L888.2,157.7L892.1,163.7L895.7,164.1L897.9,163.2L899.7,161.4L898.9,158.6L896.8,157L895.3,157.8L894.4,156.5L894.8,156.1L896.9,155.9L898.7,156.7L900.7,159.1L901.6,162L902,164.5L897.8,165.9L893.9,167.9L890,172.4L888.1,173.8L888.1,172.9L890.5,171.4L891,169.6L890.2,166.6L887.2,168L886.4,169.5L886.9,171.7L884.9,172.7L882.1,168.2L878.7,163.8L876.6,162L870.1,163.9L865,165L844.3,169.6L843.7,164.8L844.3,154.2L848.6,153.3L855.4,152z",
- tn:"M696.6,318.2L644.7,323.2L629,325L624.4,325.5L620.5,325.5L620.3,329.6L612.1,329.8L605.1,330.5L597,330.4L595.6,337.4L593.9,342.9L590.6,345.7L589.3,350.1L589,352.6L584.9,354.9L586.4,358.5L585.4,362.8L584.4,363.6L692.6,353.2L693,349.2L694.8,347.8L697.6,347L698.3,343.3L702.4,340.6L706.5,339.1L710.5,335.5L715,333.5L715.5,330.4L719.6,326.4L720.1,326.3 C 720.1,326.3 720.1,327.5 721,327.5 C 721.8,327.5 722.9,327.8 722.9,327.8L725.2,324.2L727.2,323.6L729.5,323.9L731.1,320.3L734.1,317.7L734.5,315.8L734.8,312.1L732.6,311.9L730,313.9L723,313.9L704.7,316.3L696.6,318.2z",
- ar:"M593.8,343L589.8,343.7L584.7,343.1L585.1,341.5L588.1,338.9L589,335.3L587.2,332.3L508.8,334.8L510.4,341.7L510.4,349.9L511.8,360.9L512,398.7L514.3,400.6L517.2,399.3L520,400.4L520.7,407L576.3,405.9L577.4,403.8L577.1,400.2L575.3,397.2L576.9,395.8L575.3,393.2L576,390.7L577.4,385.1L579.9,383.1L579.2,380.8L582.9,375.4L585.6,374L585.5,372.5L585.1,370.7L588,365.1L590.4,363.9L590.8,360.4L592.6,359.2L589.4,358.7L588.1,354.7L590.9,352.3L591.4,350.3L592.7,346.3L593.8,343z",
- mo:"M558.4,248.1L555.9,245L554.7,242.7L490.4,245.1L488.1,245.2L489.3,247.7L489.1,250L491.6,253.9L494.7,258L497.8,260.8L500,261L501.5,261.9L501.5,264.9L499.6,266.5L499.2,268.8L501.2,272.2L503.7,275.2L506.3,277L507.6,288.6L507.9,324.7L508.2,329.4L508.6,334.8L531.1,333.9L554.3,333.2L575.1,332.4L586.7,332.2L588.9,335.6L588.2,338.9L585.1,341.3L584.6,343.2L589.9,343.6L593.8,342.9L595.5,337.5L596.2,331.6L598.3,329L600.9,327.6L600.9,324.5L602,322.6L600.3,320L598.9,321L596.9,318.8L595.7,314L596.5,311.5L594.5,308.1L592.7,303.5L587.9,302.7L580.9,297.1L579.2,293L580,289.8L582.1,283.7L582.5,280.9L580.6,279.8L573.7,279L572.7,277.3L572.6,273.1L567.1,269.7L560.1,261.9L557.8,254.6L557.6,250.4L558.4,248.1z",
- ga:"M672.2,355.5L672.2,357.7L672.4,359.8L673.1,363.2L676.4,371.1L678.9,381L680.3,387.1L681.9,392L683.4,398.9L685.5,405.2L688.1,408.6L688.6,412L690.5,412.8L690.7,414.9L688.9,419.8L688.4,423L688.2,424.9L689.9,429.3L690.2,434.6L689.4,437.1L690,437.9L691.5,438.7L691.7,441.9L693.9,445.2L696.2,447.4L704.1,447.6L714.9,446.9L736.4,445.6L741.9,445L746.4,445L746.6,447.9L749.2,448.7L749.5,444.3L747.9,439.8L749,438.2L754.9,439L759.8,439.3L759.1,433L761.3,423L762.8,418.8L762.3,416.2L765.6,410L765.1,408.6L763.2,409.3L760.6,408L760,405.9L758.7,402.4L756.4,400.3L753.8,399.6L752.2,394.8L749.3,388.4L745.1,386.5L743,384.6L741.7,382L739.6,380L737.3,378.7L735.1,375.8L732,373.6L727.5,371.8L727,370.3L724.5,367.4L724.1,366L720.7,361L717.1,361.1L713.4,358.7L712,357.4L711.6,355.7L712.5,353.7L714.7,352.6L714.1,350.5L672.2,355.5z",
- sc:"M764.9,408.1L763.1,409.1L760.5,407.8L759.9,405.7L758.6,402.1L756.3,400L753.7,399.4L752.1,394.5L749.4,388.6L745.2,386.6L743.1,384.7L741.8,382.1L739.7,380.1L737.4,378.9L735.1,375.9L732.1,373.7L727.6,371.9L727.1,370.4L724.6,367.5L724.2,366.1L720.8,360.9L717.4,361.1L713.3,358.6L712,357.4L711.7,355.6L712.5,353.6L714.8,352.7L714.3,350.4L720,348L729.2,343.5L736.9,342.6L753,342.2L755.7,344.1L757.4,347.5L761.7,346.8L774.3,345.4L777.2,346.2L789.8,353.8L799.9,361.9L794.5,367.4L791.9,373.5L791.4,379.8L789.8,380.6L788.7,383.4L786.2,384L784.1,387.6L781.4,390.3L779.1,393.7L777.5,394.5L773.9,397.9L771,398.1L772,401.3L767,406.8L764.9,408.1z",
- ky:"M725.9,295.2L723.7,297.6L720.1,301.6L715.1,307.1L713.9,308.8L713.9,310.9L709.5,313.1L703.8,316.5L696.6,318.3L644.7,323.2L629,324.9L624.4,325.4L620.5,325.4L620.3,329.6L612.1,329.8L605.1,330.4L597.1,330.4L598.3,329L600.8,327.5L601.1,324.3L602,322.5L600.4,319.9L601.2,318L603.4,316.3L605.5,315.6L608.3,316.9L611.9,318.2L613,317.9L613.1,315.6L611.9,313.2L612.2,310.9L614.1,309.5L616.7,308.8L618.3,308.2L617.5,306.4L616.9,304.5L618.4,303.5 C 618.4,303.4 619.6,299.9 619.6,299.8L622.7,298.3L628,297.4L632.5,296.9L633.9,298.5L635.4,299.4L637,296.3L640.2,295L642.4,296.5L642.8,297.5L644,297.2L643.8,294.2L646.9,292.5L649.1,291.4L650.6,293.1L653.9,293L654.5,291.5L654.1,289.2L656.7,285.2L661.5,281.8L662.2,276.9L665.2,276.5L668.9,274.8L671.4,273.1L671.2,271.6L670.1,270.1L670.6,267.1L674.8,267L677.1,266.2L680.4,267.7L682.5,272L687.6,272L689.7,274.3L691.3,274.1L693.9,272.8L699.1,273.4L701.7,273.6L703.4,271.6L706,270.1L707.9,269.4L708.5,272.3L710.6,273.3L713.2,275.4L713.4,281.1L714.2,282.7L716.8,2
84.2L717.5,286.5L721.7,289.9L723.5,293.6L725.9,295.2z",
- al:"M631.3,460.4L629.8,446L627,427.3L627.2,413.2L628,382.2L627.8,365.5L628,359.1L672.5,355.5L672.3,357.7L672.5,359.8L673.1,363.2L676.5,371.1L679,381L680.4,387.1L682,392L683.5,398.9L685.6,405.2L688.2,408.6L688.7,412L690.6,412.8L690.8,414.9L689,419.8L688.5,423L688.3,424.9L689.9,429.3L690.3,434.6L689.5,437.1L690.1,437.9L691.6,438.7L691.9,441.6L686.3,441.2L679.5,441.9L654,444.8L643.6,446.2L643.3,449L645.1,450.8L647.7,452.8L648.3,460.7L642.7,463.3L640,463L642.7,461L642.7,460L639.7,454.1L637.4,453.4L635.9,457.8L634.7,460.5L634,460.4L631.3,460.4z",
- la:"M607.9,459.1L604.6,455.9L605.6,450.4L605,449.6L595.7,450.6L570.7,451L570,448.6L570.9,440.2L574.2,434.2L579.3,425.5L578.7,423.1L579.9,422.5L580.4,420.5L578.1,418.4L578,416.5L576.2,412.2L576,405.8L520.6,406.7L520.6,416.3L521.3,425.7L522,429.6L524.5,433.7L525.4,438.7L529.7,444.2L530,447.4L530.6,448.1L530,456.6L527,461.6L528.6,463.6L527.9,466.2L527.2,473.5L525.8,476.7L526,480.3L530.7,478.8L542.8,479L553.1,482.5L559.6,483.7L563.3,482.2L566.5,483.3L569.8,484.3L570.6,482.2L567.3,481.1L564.8,481.6L562,479.9 C 562,479.9 562.2,478.7 562.8,478.5 C 563.5,478.3 565.9,477.5 565.9,477.5L567.7,479L569.4,478L572.7,478.7L574.1,481.1L574.5,483.3L579,483.7L580.8,485.4L579.9,487.1L578.7,487.9L580.3,489.5L588.7,493L592.2,491.7L593.2,489.3L595.8,488.7L597.6,487.2L598.9,488.2L599.7,491.1L597.4,491.9L598.1,492.6L601.5,491.3L603.7,487.9L604.5,487.4L602.4,487.1L603.2,485.4L603.1,484L605.2,483.5L606.3,482.2L606.9,483 C 606.9,483 606.8,486.1 607.6,486.1 C 608.4,486.1 611.8,486.7 611.8,486.7L615.8,488.7L6
16.8,490.1L619.7,490.1L620.8,491.1L623.1,488L623.1,486.6L621.8,486.6L618.4,483.8L612.6,483L609.4,480.8L610.5,478L612.8,478.3L612.9,477.7L611.2,476.7L611.2,476.2L614.4,476.2L616.2,473.2L614.9,471.2L614.5,468.5L613.1,468.6L611.2,470.7L610.5,473.3L607.4,472.7L606.5,470.9L608.2,469L610.1,465.5L609.1,463.1L607.9,459.1z",
- ms:"M631.5,459.3L631.3,460.6L626.1,460.6L624.6,459.7L622.5,459.4L615.7,461.4L614,460.6L611.4,464.8L610.3,465.5L609.1,463L608,459.2L604.6,456L605.7,450.4L605,449.5L603.2,449.7L595.3,450.6L570.7,451L570,448.7L570.8,440.4L574,434.7L579.2,425.6L578.7,423.1L580,422.5L580.4,420.5L578.1,418.5L578,416.3L576.1,412.2L576,406.2L577.4,403.8L577.1,400.3L575.4,397.3L576.9,395.8L575.3,393.3L575.8,391.6L577.4,385.1L579.8,383.1L579.2,380.7L582.9,375.4L585.7,374L585.5,372.4L585.2,370.7L588.1,365.1L590.4,363.9L590.6,363L627.9,359.1L628.1,365.4L628.2,382L627.4,413.1L627.3,427.1L630,445.9L631.5,459.3z",
- ia:"M569.1,199.5L569.4,202.3L571.6,202.9L572.6,204.1L573.1,206L576.9,209.3L577.6,211.7L576.9,215.2L575.3,218.4L574.5,221.1L572.3,222.7L570.6,223.3L565,225.2L563.6,229L564.4,230.4L566.2,232.1L565.9,236.1L564.2,237.6L563.4,239.3L563.5,242.1L561.6,242.5L560,243.6L559.7,245L560,247.1L558.5,248.2L556,245.1L554.7,242.6L489,245.1L488.1,245.3L486,240.8L485.8,234.2L484.2,230L483.5,224.8L481.2,221.1L480.3,216.3L477.6,208.8L476.4,203.4L475.1,201.2L473.5,198.5L475.4,193.6L476.8,187.9L474,185.9L473.6,183.1L474.5,180.6L476.2,180.6L558.9,179.3L559.7,183.5L561.9,185.1L562.2,186.5L560.2,189.9L560.4,193.1L562.9,196.9L565.4,198.2L568.5,198.7L569.1,199.5z",
- mn:"M475.2,128.8L474.7,120.3L472.9,113L471.1,99.5L470.6,89.7L468.8,86.3L467.2,81.2L467.2,70.9L467.9,67L466.1,61.6L496.2,61.6L496.5,53.4L497.2,53.2L499.4,53.7L501.4,54.5L502.2,60L503.6,66.2L505.2,67.8L510.1,67.8L510.4,69.2L516.7,69.6L516.7,71.7L521.6,71.7L521.9,70.4L523,69.2L525.3,68.6L526.6,69.6L529.5,69.6L533.4,72.1L538.7,74.6L541.1,75L541.6,74.1L543.1,73.6L543.5,76.5L546.1,77.8L546.6,77.3L547.9,77.5L547.9,79.6L550.5,80.5L553.6,80.5L555.2,79.7L558.4,76.5L561,76L561.8,77.8L562.3,79.1L563.3,79.1L564.2,78.3L573.1,78L574.9,81L575.6,81L576.3,79.9L580.7,79.6L580.1,81.9L576.2,83.7L566.9,87.8L562.1,89.8L559.1,92.3L556.6,95.9L554.4,99.8L552.6,100.6L548.1,105.6L546.8,105.8L542.5,108.5L540,111.7L539.8,114.9L539.9,123L538.5,124.6L533.4,128.4L531.2,134.4L534,136.6L534.7,139.9L532.9,143.1L533,146.8L533.4,153.6L536.4,156.6L539.8,156.6L541.7,159.7L545,160.2L548.9,165.9L556,170L558.1,172.9L558.8,179.3L477.6,180.5L477.2,144.8L476.8,141.8L472.7,138.4L471.5,136.5L471.5,134.9L473.6,133.3L475,132L475
.2,128.8z",
- ok:"M380.3,320.8L363.6,319.5L362.7,330.5L383.2,331.6L415.2,332.9L412.9,357.3L412.5,375.2L412.7,376.8L417,380.4L419.1,381.6L419.8,381.3L420.5,379.3L421.8,381.1L423.9,381.1L423.9,379.7L426.6,381.1L426.2,385L430.3,385.2L432.8,386.4L436.9,387.1L439.4,388.9L441.7,386.8L445.2,387.5L447.7,390.9L448.6,390.9L448.6,393.2L450.9,393.9L453.2,391.6L455,392.3L457.5,392.3L458.4,394.8L464.7,396.9L466.1,396.2L467.9,392.1L469.1,392.1L470.2,394.2L474.3,394.8L478,396.2L480.9,397.1L482.8,396.2L483.5,393.7L487.8,393.7L489.9,394.6L492.6,392.6L493.7,392.6L494.4,394.2L498.5,394.2L500.1,392.1L502,392.6L504,395.1L507.2,396.9L510.4,397.8L512.4,398.9L512,361.7L510.6,350.7L510.5,341.9L509,335.3L508.2,328.2L508.2,324.3L496,324.7L449.6,324.2L404.6,322.1L380.3,320.8z",
- tx:"M361.4,330.5L384.1,331.6L415.2,332.8L412.9,356.2L412.6,374.4L412.6,376.4L417,380.3L419,381.7L420.1,381.1L420.5,379.3L421.7,381.1L423.8,381.2L423.8,379.7L425.4,380.7L426.6,381.1L426.2,385.1L430.3,385.2L433.2,386.4L437.2,386.9L439.6,389L441.7,386.9L445.4,387.5L447.6,390.7L448.7,391.1L448.6,393L450.8,393.8L453.1,391.8L455.2,392.4L457.5,392.4L458.4,394.8L464.7,397L466.3,396.2L467.8,392L468.1,392L469.1,392.1L470.3,394.2L474.2,394.8L477.5,396L481,397.1L482.8,396.2L483.5,393.7L488,393.7L489.8,394.6L492.6,392.5L493.7,392.6L494.5,394.2L498.6,394.2L500.1,392.1L502,392.6L503.9,395L507.5,397L510.3,397.8L511.8,398.6L514.3,400.6L517.3,399.3L520,400.4L520.6,406.5L520.5,416.2L521.2,425.8L521.9,429.4L524.6,433.8L525.5,438.7L529.7,444.3L529.9,447.4L530.6,448.2L529.9,456.6L527,461.6L528.6,463.7L527.9,466.1L527.3,473.5L525.8,476.8L526.1,480.3L520.4,481.9L510.5,486.4L509.6,488.4L507,490.3L504.9,491.8L503.6,492.6L497.9,497.9L495.2,500L489.9,503.3L484.2,505.7L477.9,509.1L476.1,510.5L470.3,514.1L466
.9,514.7L463,520.2L459,520.6L458,522.5L460.3,524.4L458.8,529.9L457.5,534.5L456.4,538.3L455.6,542.9L456.4,545.3L458.2,552.2L459.1,558.4L460.9,561.1L459.9,562.6L456.9,564.5L451.2,560.6L445.7,559.5L444.4,560L441.2,559.4L437,556.3L431.8,555.1L424.2,551.8L422.1,547.9L420.8,541.4L417.6,539.5L416.9,537.2L417.6,536.6L417.9,533.2L416.6,532.5L416,531.5L417.3,527.2L415.6,524.9L412.4,523.6L409,519.3L405.5,512.6L401.3,510L401.4,508.1L396.1,495.8L395.3,491.6L393.5,489.7L393.3,488.2L387.4,482.9L384.8,479.8L384.8,478.7L382.2,476.6L375.4,475.4L368,474.8L364.9,472.5L360.4,474.3L356.8,475.8L354.5,479L353.6,482.7L349.2,488.9L346.8,491.3L344.2,490.3L342.4,489.2L340.5,488.5L336.6,486.3L336.6,485.6L334.8,483.7L329.6,481.6L322.2,473.8L319.9,469.1L319.9,461.1L316.7,454.6L316.2,451.8L314.6,450.9L313.5,448.8L308.5,446.7L307.2,445.1L300.1,437.1L298.8,433.9L294.1,431.6L292.6,427.3L290,424.4L288.1,423.9L287.5,419.2L295.5,419.9L324.5,422.6L353.5,424.2L355.8,404.8L359.6,349.2L361.2,330.5L362.6,330.5M461.6,560.2L46
1.1,553L458.3,545.9L457.8,538.8L459.3,530.6L462.6,523.7L466.1,518.3L469.2,514.7L469.9,515L465.1,521.6L460.8,528.1L458.7,534.8L458.4,540L459.3,546.1L461.9,553.3L462.4,558.5L462.5,559.9L461.6,560.2z",
- nm:"M288.1,424L287.3,419.2L296,419.7L326.1,422.7L353.4,424.4L355.6,405.7L359.5,349.8L361.2,330.4L362.8,330.5L363.6,319.4L259.6,308.7L242.1,429.2L257.6,431.2L258.9,421.1L288.1,424z",
- ks:"M507.8,324.3L495.2,324.5L449.1,324.1L404.6,322L379.9,320.8L383.8,256.2L405.9,256.8L446.2,257.7L490.5,258.7L495.6,258.7L497.8,260.8L499.8,260.8L501.4,261.8L501.4,264.8L499.6,266.6L499.2,268.8L501.1,272.2L504,275.4L506.3,277L507.6,288.2L507.8,324.3z",
- ne:"M486,240.7L489.3,247.7L489.1,250L492.6,255.5L495.3,258.6L490.3,258.6L446.8,257.7L406,256.8L383.8,256L384.8,234.7L352.5,231.8L356.9,187.7L372.4,188.8L392.5,189.9L410.4,191.1L434.1,192.2L444.9,191.7L446.9,194L451.7,197L452.9,197.9L457.2,196.6L461.1,196.1L463.9,195.9L465.7,197.2L469.7,198.8L472.7,200.4L473.2,202L474.1,204.1L475.9,204.1L476.7,204.1L477.6,208.8L480.5,217.3L481.1,221L483.6,224.8L484.2,229.9L485.8,234.2L486,240.7z",
- sd:"M476.4,204L476.3,203.4L473.5,198.5L475.3,193.8L476.8,187.9L474,185.9L473.6,183.1L474.4,180.6L477.6,180.6L477.5,175.6L477.2,145.4L476.5,141.6L472.5,138.3L471.5,136.6L471.4,135L473.5,133.5L475,131.8L475.2,129.2L417,127.6L362.2,124.1L356.8,187.8L371.4,188.7L391.4,189.9L409.1,190.9L432.9,192.2L444.9,191.7L446.9,194L452.1,197.2L452.8,198L457.4,196.5L463.9,195.9L465.6,197.2L469.8,198.8L472.7,200.5L473.1,201.9L474.2,204.2L476.4,204z",
- nd:"M475.3,128.9L474.6,120.4L473,113.6L471.1,100.6L470.6,89.6L468.9,86.5L467.1,81.3L467.1,70.9L467.8,67.1L465.9,61.6L437.3,61L418.7,60.4L392.2,59.1L369.2,57L362.3,124.1L417.2,127.5L475.3,128.9z",
- wy:"M360.3,143.2L253.6,129.8L239.5,218.2L352.8,231.8L360.3,143.2z",
- mt:"M369.2,56.9L338.5,54.1L309.2,50.6L280,46.5L247.6,41.2L229.2,37.8L196.5,30.9L192,52.2L195.4,59.7L194.1,64.3L195.9,68.9L199.1,70.3L203.7,81L206.4,84.2L206.9,85.3L210.3,86.5L210.7,88.5L203.7,106.2L203.7,108.7L206.2,111.9L207.1,111.9L211.9,108.9L212.6,107.8L214.2,108.4L213.9,113.7L216.7,126.3L219.7,128.8L220.6,129.5L222.4,131.8L221.9,135.2L222.6,138.6L223.8,139.5L226.1,137.2L228.8,137.2L232,138.8L234.5,137.9L238.6,137.9L242.3,139.5L245,139.1L245.5,136.1L248.5,135.4L249.8,136.8L250.3,140L251.7,140.8L253.6,129.8L360.4,143.2L369.2,56.9z",
- co:"M380,320.9L384.9,234.6L271.5,221.9L259.3,309.9L380,320.9z",
- id:"M148.4,176.4L157.2,141.2L158.6,137L161.1,131L159.8,128.8L157.3,128.9L156.5,127.8L157,126.7L157.3,123.6L161.8,118.1L163.6,117.7L164.7,116.5L165.3,113.3L166.2,112.6L170.1,106.8L174,102.5L174.2,98.7L170.8,96.1L169.3,91.7L182.9,28.3L196.4,30.8L192,52.2L195.6,59.7L194,64.4L196,69L199.1,70.3L202.9,79.8L206.4,84.3L206.9,85.4L210.3,86.6L210.7,88.6L203.7,106L203.5,108.6L206.1,111.9L207.1,111.9L212,108.8L212.6,107.7L214.2,108.4L213.9,113.8L216.7,126.3L220.6,129.5L222.3,131.7L221.5,135.8L222.6,138.6L223.7,139.7L226.2,137.3L229,137.4L231.9,138.7L234.7,138L238.5,137.9L242.5,139.5L245.2,139.2L245.7,136.1L248.6,135.4L249.9,136.9L250.3,139.8L251.8,141L243.4,194.6 C 243.4,194.6 155.4,177.9 148.4,176.4z",
- ut:"M259.4,310.1L175.7,298.2L196.3,185.6L243.1,194.4L241.6,205L239.3,218.2L247.1,219.1L263.5,220.9L271.7,221.8L259.4,310.1z",
- az:"M144.9,382.6L142.2,384.7L141.9,386.2L142.4,387.2L161.3,397.8L173.4,405.4L188.1,414L205,424L217.2,426.4L242.2,429.2L259.5,310L175.7,298.1L172.6,314.5L171,314.5L169.3,317.2L166.8,317L165.5,314.3L162.8,314L161.9,312.8L161,312.8L160,313.4L158.1,314.4L158,321.4L157.8,323.1L157.2,335.7L155.7,337.9L155.1,341.2L157.9,346.1L159.1,351.9L159.9,352.9L161,353.5L160.8,355.8L159.2,357.2L155.8,358.9L153.9,360.8L152.4,364.5L151.8,369.4L149,372.1L146.9,372.8L147,373.7L146.6,375.4L147,376.2L150.7,376.7L150.1,379.5L148.6,381.7L144.9,382.6z",
- nv:"M196.3,185.5L172.7,314.3L170.9,314.7L169.3,317.1L166.9,317.1L165.5,314.4L162.8,314L162.1,312.9L161,312.8L158.2,314.5L157.9,321.3L157.6,327L157.2,335.6L155.8,337.7L153.3,336.6L84.3,232.4L103.3,164.9L196.3,185.5z",
- or:"M148.7,175.5L157.5,140.7L158.6,136.5L160.9,130.8L160.3,129.7L157.8,129.6L156.5,127.9L157,126.5L157.5,123.2L161.9,117.7L163.8,116.7L164.9,115.5L166.4,111.9L170.4,106.3L174,102.4L174.2,99L171,96.5L169.2,91.8L156.5,88.2L141.4,84.7L126,84.8L125.5,83.4L120.1,85.5L115.6,84.9L113.2,83.3L111.9,84L107.2,83.8L105.5,82.4L100.3,80.3L99.5,80.5L95.1,79L93.2,80.8L87,80.5L81.1,76.3L81.8,75.5L82,67.8L79.7,63.9L75.6,63.3L74.9,60.8L72.5,60.3L66.7,62.4L64.5,68.9L61.2,78.9L58,85.3L53,99.4L46.5,113L38.5,125.6L36.5,128.5L35.7,137.1L36.1,149.2L148.7,175.5z",
- wa:"M102,7.6L106.4,9L116.1,11.8L124.7,13.7L144.7,19.4L167.7,25L182.9,28.2L169.2,91.8L156.8,88.3L141.3,84.7L126.1,84.8L125.6,83.4L120,85.6L115.4,84.8L113.3,83.3L112,83.9L107.2,83.8L105.5,82.4L100.3,80.3L99.5,80.5L95.1,78.9L93.2,80.8L87,80.5L81,76.3L81.8,75.4L81.9,67.7L79.7,63.9L75.6,63.3L74.9,60.8L72.6,60.3L69,61.5L66.8,58.3L67.1,55.4L69.9,55.1L71.5,51L68.9,49.9L69,46.2L73.4,45.6L70.7,42.8L69.2,35.7L69.9,32.8L69.9,24.9L68.1,21.6L70.3,12.2L72.4,12.7L74.9,15.6L77.6,18.2L80.8,20.2L85.4,22.3L88.4,22.9L91.4,24.4L94.7,25.3L97,25.2L97,22.8L98.3,21.6L100.4,20.3L100.7,21.5L101.1,23.2L98.8,23.7L98.5,25.8L100.2,27.3L101.4,29.7L102,31.6L103.5,31.5L103.6,30.2L102.7,28.9L102.2,25.7L103,23.9L102.3,22.4L102.3,20.2L104.1,16.6L103,14L100.6,9.2L100.9,8.4L102,7.6zM92.6,13.5L94.6,13.4L95.1,14.8L96.6,13.1L99,13.1L99.8,14.7L98.2,16.4L98.9,17.2L98.1,19.2L96.8,19.6 C 96.8,19.6 95.9,19.7 95.9,19.4 C 95.9,19 97.3,16.8 97.3,16.8L95.6,16.2L95.3,17.7L94.6,18.3L93.1,16L92.6,13.5z",
- ca:"M144.6,382.1L148.6,381.7L150.1,379.6L150.6,376.7L147.1,376.1L146.5,375.4L147,373.4L146.9,372.8L148.8,372.2L151.8,369.4L152.4,364.4L153.8,361L155.7,358.8L159.3,357.2L160.9,355.6L161,353.5L160,352.9L159,351.9L157.8,346L155.1,341.2L155.7,337.7L153.3,336.6L84.2,232.5L103.1,164.9L36,149.2L34.5,153.9L34.4,161.3L29.2,173.1L26.1,175.7L25.8,176.9L24,177.7L22.6,181.9L21.8,185.1L24.5,189.3L26.1,193.5L27.2,197.1L26.9,203.5L25.1,206.6L24.5,212.4L23.5,216.1L25.3,220L28.1,224.5L30.3,229.4L31.6,233.4L31.3,236.7L31,237.2L31,239.3L36.6,245.6L36.1,248L35.5,250.2L34.8,252.2L35,260.4L37.1,264.1L39,266.7L41.8,267.2L42.8,270L41.6,273.5L39.5,275.1L38.4,275.1L37.6,279L38.1,281.9L41.3,286.3L42.9,291.6L44.4,296.3L45.7,299.4L49.1,305.2L50.5,307.8L51,310.7L52.6,311.7L52.6,314.1L51.8,316L50,323.2L49.6,325.1L52,327.8L56.2,328.3L60.7,330.1L64.6,332.2L67.5,332.2L70.4,335.3L73,340.1L74.1,342.4L78,344.5L82.9,345.3L84.3,347.4L85,350.6L83.5,351.3L83.8,352.3L87.1,353.1L89.8,353.2L93,351.5L96.9,355.7L97.7,358L100.
2,362.2L100.6,365.4L100.6,374.8L101.1,376.6L111.1,378.1L130.8,380.8L144.6,382.1zM56.5,338.4L57.8,340L57.6,341.3L54.4,341.2L53.8,340L53.2,338.5L56.5,338.4zM58.4,338.4L59.7,337.8L63.2,339.9L66.3,341.1L65.4,341.7L60.9,341.5L59.3,339.9L58.4,338.4zM79.1,358.2L80.9,360.6L81.7,361.5L83.3,362.1L83.8,360.7L82.9,358.9L80.2,356.9L79.1,357L79.1,358.2zM77.7,366.9L79.5,370L80.7,372L79.2,372.2L77.9,371 C 77.9,371 77.2,369.6 77.2,369.1 C 77.2,368.7 77.2,367 77.2,367L77.7,366.9z"}
+ hi:"M298.189,269.828l0.072-0.288l0.72-0.721l0.216-0.359l0.072-0.72l-0.721,0.575l-0.72,0.721L298.189,269.828zM304.525,269.036l0.072-0.145l0.792-0.647l0.144-0.792l0.288-0.72v-0.217l-0.72-0.792h-0.721l-0.719-0.071l-0.721,0.432l-0.792,0.432l-0.072,0.145l-0.432,0.72l0.647,0.72l0.721,0.36l0.72,0.359L304.525,269.036zM318.35,274.58l0.72-0.216l0.72-0.216l-0.504-0.721l-0.144-0.72l-0.792,0.071l-0.216-0.719l-0.504-0.721l-0.504-0.72l-0.792,0.288l-0.721,0.648h-0.72l-0.144,0.359l0.144,0.792l0.72,0.72l0.648,0.721l0.72-0.072l-0.072-0.504l0.721,0.288L318.35,274.58zM326.414,276.524l0.216-0.072l0.792-0.36l-0.072-0.72l-0.504,0.072h-0.72l-0.721-0.145l-0.792-0.144l-0.72-0.072l-0.721-0.072v0.288l-0.503,0.72h0.72h0.72l0.792-0.071l0.721,0.359L326.414,276.524zM326.054,279.332l0.144-0.072l0.721-0.72l-0.648-0.721l-0.721-0.216l-0.791,0.216l0.647,0.721L326.054,279.332zM330.589,280.699l0.505-0.071l0.792-0.359h0.72l0.433-0.217l0.72-0.72l-0.36-0.721l-0.72-0.359l-0.721-0.504l-0.144-0.216l-0.792-0.145l-0.72,0.288l-
0.721-0.144l-0.504-0.721l-0.792-0.144l-0.288,0.36l-0.144,0.72l0.504,0.72l0.72,0.36l0.72,0.359h0.072l0.072,0.792L330.589,280.699zM336.71,295.172l0.72,0.216l0.576-0.72l0.287-0.72l0.792-0.433l0.433-0.432l0.792-0.576l0.721,0.072l0.792-0.216l0.792-0.289l0.72-0.647l0.216-0.216l0.72-0.504l-0.072-0.721l-0.72-0.432l-0.504-0.792l-0.433-0.432l-0.432-0.721l-0.287-0.72l-0.648-0.72l-0.721-0.36l-0.72-0.359l-0.72-0.36l-0.792-0.288l-0.721-0.144l-0.72-0.432l-0.792-0.576l-0.359-0.145l-0.433,0.721l0.145,0.72l0.576,0.792l-0.504,0.72l-0.433,0.72l-0.072,0.072l-0.72,0.504l-0.288,0.721l0.504,0.719l0.288,0.721l0.288,0.792v0.216l0.288,0.721l-0.072,0.792l-0.071,0.72l-0.072,0.72l0.36,0.72l0.72,0.216l0.432,0.288L336.71,295.172z",
+ ak:"M553.678,107.837l0.287-0.216l0.721-0.72l0.504-0.792l0.36-0.72l0.647-2.232l0.792-1.512l0.288-0.792l0.433-2.736v-2.232l-0.433-3.024l-1.008-2.304l0.432-0.72l-0.72,0.288l-2.088-3.96l-0.144-0.72l0.288-0.72l0.503-0.792l-0.576-2.232l-0.431-0.72l0.071-0.72l0.648-0.792l0.864-2.232l0.071-0.792l-0.145-0.72l0.145-1.296l-0.432-1.44l0.72-0.576l0.648-0.72l-0.072-0.72l0.936-1.368l0.721,0.216l0.575-0.72l0.145-0.72l0.504-0.72l0.288-0.72l0.72-0.576l-0.216,2.088l-0.216,0.504l0.359,0.792l-0.288,0.72l0.145,0.72l0.504-0.72l0.217-1.512l0.287-0.072v1.512l-0.216,0.72l0.648-0.72l0.216-0.792l0.144-0.72v-0.864l-0.359-2.304l0.504-0.72l0.72-0.576l0.792-0.432h1.008l-0.071-0.648l-0.721-0.432l-0.359-0.792v-0.72l0.72-0.864l0.432-0.792l0.72-0.36l0.648-0.576l0.792,0.432l0.721,0.216l0.719,0.576h0.721l0.648-0.144l0.719,0.216l0.721,0.432l0.433,0.72l0.72,0.216h0.791l0.721,0.36l1.584,0.432l0.792,0.36h0.72l0.793,0.504l0.215,0.72l0.577,0.72l0.431,0.288v0.72l-0.719,0.144l-0.289,0.936l0.433,0.72l0.792,0.504l0.359,0.72l0.
36,1.512l-0.071,1.512l0.288,2.376l-0.721,0.72l-0.72,0.432l-0.217,0.72l-0.071,1.512l-0.721,1.152l-0.792,0.144l-0.792,0.576l-0.144,1.512l0.072,1.152l0.936,0.864l0.793,0.072l0.719,0.288l0.577-0.792l0.359-0.72l0.721-0.576l0.359-1.296l-0.144-0.72l0.72-0.288l0.792-0.72l0.72-0.288l1.152-0.864l0.792,0.144l0.72,0.288l0.72,0.72l0.864,1.512l0.792,2.952l0.433,0.72l0.432,1.512l0.432,1.584l0.36,0.864l0.72,1.224h0.072l0.072,0.576l-0.216,0.288l-0.145,1.512l0.216,0.72l-0.144,1.584l-0.433,0.72l-0.504,0.216l0.144-0.216l-0.215-0.72l-0.36-0.504l-0.792,0.432l-0.144,0.648l-0.505,0.72l0.072,1.584l-0.576,0.72l-0.863,0.648l-0.073,0.144l-0.216,0.36l-0.215,0.72l-0.073,2.232l-1.296,2.232l-0.504,1.512l-3.527,0.72l-7.849,1.296l-0.864-0.648l-12.168,1.512l-4.247,0.432H553.678z",
+ fl:"M561.813,240.316l-0.144-0.359l-0.145-0.361l0.36-1.079l-0.72-0.72l-0.72-0.36l-1.153-1.513l0.217-0.936l0.72-0.576l9.288-0.936l15.624-1.872l1.08,1.656l0.144,0.72l0.577,0.72l25.704-1.872l0.792,0.504l0.575,1.513l0.721,0.071l0.72-0.504l0.072-1.584l-0.145-0.72l-0.433-0.72l-0.071-0.72l0.216-0.792h0.36l0.576-0.577l0.792,0.288l1.943,0.433l0.72,0.071l0.36-0.071l0.36-0.072l0.864,0.288l-0.145,1.513l-0.432-0.505l0.432,0.792l0.721,0.721l0.359,0.72l0.216,1.368l0.792,1.512l0.217,0.792l1.151,2.736l1.152,2.231l2.376,3.96l4.176,5.256l1.44,1.513l0.504,0.72l0.359,0.792l-0.576,0.72l0.217,1.512l0.432,1.369l0.36,0.719l1.584,2.232l-0.792-0.792l-1.513-2.376l-0.504-2.232l0.145-1.512l-0.145-0.791l-0.647-0.505l-0.72,0.288l-0.792-0.72l0.144-0.72l-0.721-0.433h-0.287l0.504,1.512l0.936,2.232l0.433,0.72l2.231,3.6l2.881,4.104l1.224,2.593l0.936,1.439v0.72l-0.144,0.288l0.216-0.145l0.72,0.36l1.225,1.513l0.144,0.936l0.36,0.216l0.863,2.808l0.145,3.457l0.144,0.792v2.231l0.145,1.512l0.216,0.937l-0.072,0.72l-0.288-0.79
2l-0.216,0.792l0.072,0.721l-0.576,0.647l-0.072,0.72l-0.359,0.792l0.145,0.721l-0.217,0.432l0.504,1.439l-0.504,0.721l-0.288,0.792l0.288,0.72l-0.936-0.36l0.432,0.36l-0.792-0.432l-0.72,0.504l-0.576,0.647l-0.721,0.36h-0.791l-0.721-0.145l-0.936,0.576l-1.513,0.505l-0.72-0.793l-0.287-0.72l0.575-0.72l0.72,0.575l0.937,0.433l0.433-0.72l-0.721-0.576h-0.792l-0.648-0.216l-1.296-1.44l-0.359-0.792l-0.937-1.296l-0.72-0.576l-0.217-0.72l-1.439-0.576l-0.432-0.071l-0.792-0.073l-0.792,0.217l-0.721-0.432l0.721-0.289h-0.576l-1.225-1.512l-0.792-2.808l-0.72-0.648l-0.72-0.216l-0.072-0.432l0.576-0.72l0.072-0.792l0.863-1.081l-1.008,0.792l-0.144,0.721l-0.72,0.792l-0.721,0.072l0.072-0.504l-0.359-0.721l-0.145-0.792l0.071-1.512l-0.504-0.721l0.793-0.504l-0.145-0.144l-1.368,0.72l-0.36-0.504l-0.792-0.072l0.721,0.504l0.432,0.721l0.216,0.72l-0.287-0.144l-0.721,0.072l-0.72-0.216l-1.151-1.225l-0.505-0.721l-1.656-2.735l0.145-0.288l-0.432-0.72l-1.44-0.72l-0.504-0.721l0.72,0.576v-0.504l0.721-0.288l0.216-1.225l1.296-2.231l-0.
145-0.648l-0.647-0.72l-0.72,0.72l-0.217-0.72l-1.584-0.792v0.145l0.505,0.575v0.721l0.216,0.145h0.72l-0.36,1.511l-0.504,0.721l-0.071-0.288l-1.44-0.937l0.792,1.081l-0.792-0.721l-0.505-0.792l0.361-1.224v-1.513l-0.217-0.647l0.792-3.815l0.072-0.865l-0.216-0.72l-0.145-2.231l-0.144-0.36l-0.072-0.792l-0.792-0.359l-0.576-0.721v-0.72l-1.152-1.08l-1.512,0.145l-0.72-0.216l-0.432-0.721l-0.721-0.288l-0.647-0.863l-2.16-1.44l-0.072-0.721l-0.359-0.792l-1.585-0.719l-1.08-1.513l-1.512-0.936l-0.72-0.072l-1.656-0.864l-0.432-0.071l-0.792,0.216l-1.44,0.144l-0.72,0.576l-0.36,0.72l0.289,0.359l-1.009-0.287l0.936,0.432l0.288,0.72l-0.792-0.216l-0.503,0.216l-0.793,0.217l-2.232,1.871l-0.719,0.073l-0.145-0.361l-0.792,0.648l-0.144,0.36l-0.721,0.071l-1.512,0.433l-0.288,0.216l-0.792,0.072l-0.72-0.288l-0.288-0.721l0.071-0.792l0.073,0.721l0.287,0.792l0.72-0.216l-0.144-0.721l-0.432-0.792l-0.721-0.72l-0.72-0.216l-0.792-0.432h0.288l-0.288-0.288l-0.72-0.36l-0.72-0.72l1.512,0.576l0.792,0.504l0.432-0.504l-0.792,0.071l-0.432-
0.792l-0.792,0.145l-1.08-0.72l0.36-0.648l0.576-0.216l0.144-0.721l-1.152,0.864l-0.72-0.36l-0.721,0.145l0.36,0.576l0.72,0.432l0.145,0.721l-1.513-0.864l-1.871-0.648l-3.024-0.647h-0.72l-0.72-0.217l1.512,0.072l0.144-0.432l0.721-0.144l0.792,0.359l0.647,0.144l-0.36-0.647l-1.296-0.576l-0.791,0.217l-0.721,0.359l-0.216-0.647l-1.512,1.367l-0.36,0.072l-1.944,0.216l-2.304,0.576l-0.792,0.071l0.216-0.144l1.152-0.287l0.576-0.721l-0.792-0.72l-0.145-0.721l-0.288,0.864l-0.432,0.72l-0.36-1.007l-0.432,0.431l0.072,0.073l0.144,0.288l-0.359,0.792l-0.648,1.008l-0.72,0.432l-0.793,0.288l-0.432-0.072l0.36-0.72l0.72-0.72l-0.071-0.36L561.813,240.316z",
+ nh:"M673.126,74.573l-0.72-0.72l-0.432-0.864v-0.864l0.36-0.72l-0.433-2.232v-1.512l-0.647-2.592l0.359-0.72l-0.144-1.152l0.432-0.792l0.216-0.72l-0.071-0.792l0.288-0.72l-0.145-0.792l0.288-1.296l-0.432-1.512l-0.072-0.792l0.72-0.72l0.288-0.072l1.296-1.44l0.576-1.08l0.072-0.72l-0.288-0.72l-0.576-0.72l-0.145-0.792l0.432-1.512l-0.503-1.08l0.216-0.36l0.072-0.072l-0.145-0.72l0.359-1.512v-0.72l0.721-0.576l0.72,0.216l0.72-0.792l0.145,0.36l5.544,16.848l0.864,2.232v0.792l0.216,0.72l0.36,0.72l0.72,0.648l0.792,0.36l0.071,0.72l0.721,0.792l0.36,0.144l0.359,0.216l-0.359,1.512v0.72h-0.36l-0.36,0.072l-0.791,0.504l-0.505,0.792l-0.216-0.072l-0.432,0.792l-0.937,1.08L673.126,74.573z",
+ wi:"M505.149,52.901l0.72,0.72l0.792,0.144l0.72-0.144l2.953-1.08l1.439-0.864l0.792-0.216l0.792-0.432l0.72-0.576l0.937-0.432l0.792,0.576l-0.145,0.792l-0.504,0.72v0.72l-0.216,0.72l-0.288,0.504h0.792l0.721-0.432l0.791,0.144l0.72,0.36l1.296,0.144l0.361,0.36l0.792,0.288l0.72,0.576l0.864,1.44l7.92,1.512l2.592,1.152l0.288-0.072l1.512,0.216l0.72-0.216l0.792,0.288l1.944,0.216l0.72,0.432l0.145,1.368l0.72,0.072l1.152,0.36l0.792,0.72l-0.217,0.216l0.36,0.72l-0.144,1.512l-0.288,0.72l0.288,0.648l0.72-0.216l0.792-0.072l-0.433,1.512l0.072,0.72l0.72,0.648h0.072l0.36,0.144l-0.216,0.72v0.504l-0.721,0.504l-0.792,0.288l-0.071,0.72l-0.433,0.792l-0.576,1.512l-0.216,0.936l0.145,0.72l0.72,0.072l0.36-0.72l0.72-0.576l0.504-0.792l0.144-0.72l0.433-0.72l0.72-0.288l0.792-0.576l0.648,0.72l0.36,0.792l-0.145,0.72l-0.792,2.16l-0.144,1.44l-0.216,0.792l0.575,1.512l-0.071,0.36l-0.721,0.576l-0.36,0.792l-0.359,1.512v0.72l0.359,1.584v0.792l-0.432,0.792l-0.145,0.792l0.072,0.72l-0.504,1.584l-0.144,1.44l0.504,1.656l-0.216,0.
72l0.648,0.792v0.72l0.504,0.72l0.215,0.72v0.792l-0.144,0.72l0.217,1.584h-0.361l-10.296,0.936l-13.607,0.792l-0.576-1.512l-2.232-0.432l-0.791-0.36l-0.36-0.72l-0.144-0.936l-0.505-0.72l-0.144-1.296l-0.288-1.152l0.72-1.512l-0.36-0.72l-0.575-0.216l-0.288-0.792l-0.216-0.288l0.071-0.576l-0.288-0.792l0.072-0.288l-0.216-0.792l-0.288-2.016l-0.647-0.936l-0.721-0.72l-0.72-0.504l-0.721-0.145l-0.791-0.432l-1.44-1.296l-1.008-1.584l-1.08-0.72l-1.008-0.36l-0.72-0.432l-0.505-0.792l-1.296-0.216l-0.792-0.36l-0.72-0.72l-1.225-0.864l0.36-0.792l0.072-1.296l-0.433-1.584l0.36-0.792l-0.145-1.44l0.792-1.944l-0.863-1.512l-0.721-0.072l-0.504-0.792v-0.792l0.576-0.648l0.433-0.792l0.144-0.72l1.512-1.08l1.44-0.72l0.433-0.648l0.144-0.864l-0.288-5.976l0.648-0.072l0.359-0.792l0.072-0.072L505.149,52.901z",
+ me:"M676.51,42.389l0.576-0.72l0.72,0.36l0.721-0.288l-0.144-0.72l0.144-0.72l0.216-0.072l0.721,0.288l-0.793-1.512l0.145-0.144l0.145-0.792l0.432-0.72l1.224-1.512l-0.36-0.576l0.864-1.584l-0.647-0.72v-1.512l-0.433-0.72l0.36-2.232l0.648-1.08l-0.504-3.096l3.455-10.224l0.72-0.144l0.721,0.072l0.432,1.512l0.864,0.648l0.863,0.216l0.721-0.72l0.72-0.288l0.648-0.792l0.72-0.36l0.576-0.792l0.864-0.36l0.792,0.216l1.512,0.648l1.512,1.08l0.648,0.144l3.24,9.864l0.936,2.52v0.72l0.432,0.72l-0.071,0.648l0.216,0.72l0.72-0.072l0.792,0.504h0.793l0.719-0.288l0.504,0.36l-0.215,0.792l0.215,0.72l0.576,0.72v0.792l0.433,0.792l0.792,0.648l0.576-0.648h0.576l0.504,0.144l0.071,0.072l0.072,0.072l1.368,1.44l-0.937,1.224l0.721,0.648l0.575-0.72l-0.215-0.288l0.791,0.648l-0.072,0.72l-0.791,1.44l-0.721,0.504l-1.151-0.144l0.504,0.792l-0.72-0.144v0.504h-0.072l-0.648,0.36v0.72h-0.72l-0.144,0.72l-0.36-0.072l-0.648-0.792l-0.432,0.864l0.216,0.72l-0.145,0.792l-0.215-0.792l-0.072,0.792l-0.288-0.72l-0.433,0.36l0.289,0.72l-0.289,0.
72l-0.504-0.792l-1.943-0.504l0.144,0.72l-0.72,0.648l-0.648-0.72l0.072,0.72l-0.216,0.792l0.144,0.72l0.433,0.792l-1.081-0.432h-1.512l0.36-0.504l0.072-0.792l-0.72,0.144l0.144-0.72l-0.576-0.72l0.217,1.224l-1.081,0.648l0.433,0.72l-0.072,0.792l-0.216,0.72l0.072,0.792l-0.145,0.792l0.36,0.72l-0.576,0.864l-0.288,0.72l-0.792-0.288l-0.792-0.072l-0.288,0.72l0.072,0.792l-0.144,0.72l-0.577-0.432l-0.216-0.792l0.072-0.72l-0.144,0.144l-0.072,0.792l0.359,1.44l-0.792-0.36l0.217-0.72l-0.432-0.72l-0.289,0.144l-0.216,1.008l0.576,0.792l-0.288,0.72l-1.08-2.448l0.072-0.792l-0.36,0.72l-0.071,0.72l0.288-0.288l1.008,2.304l-0.216,0.792l-0.576-1.512l-0.216-0.072l-0.217,0.792l-0.36,0.72l-0.071-0.72l-0.072,0.72l-0.36-1.368l-1.151,1.584l-0.216,0.792l0.072,0.72l0.504,0.216l-1.008,1.512l0.359,0.72l-0.576,1.368l-0.72,0.72v0.72l0.216,0.792l-0.288,0.792l-0.647,0.72l-0.36-0.144l-0.721-0.792l-0.071-0.72l-0.792-0.36l-0.72-0.648l-0.36-0.72l-0.216-0.72v-0.792l-0.864-2.232l-5.544-16.848L676.51,42.389z",
+ ri:"M680.83,81.269l2.881-0.864l0.72,0.504l0.287,0.72l0.433,0.216l0.071,0.576l0.505,0.504l0.072,0.072l-0.36,0.36l-0.576-0.792l0.216,0.792l-0.287,0.72l0.431,0.792l0.073,0.72l0.287,1.008l-0.144,0.792l-2.16,1.44l-0.72,0.36l-0.072-0.36l-0.072-0.288l0.217-0.576l-0.145-0.792L680.83,81.269z",
+ ny:"M613.222,93.365l0.288-0.216l1.656-1.656l1.224-1.512l0.937-0.936l0.575-0.72l0.36-0.792l1.297-1.44v-0.792l-0.937-1.656l0.36-0.504l-0.072-0.288l-1.584-0.288l0.071-0.576l-0.432-1.368v-0.072l0.792-0.36l0.721-0.504l0.791-0.216l0.72-0.432l1.585-0.648l2.88-0.576l3.024-0.144l1.943,0.792l1.513-0.864l1.512-0.36l1.512-0.072l0.576,0.216l0.504-0.72l0.72-0.432l0.648-0.72l0.432-0.792l0.936-0.72l0.793-0.864h0.791l0.505-0.72l-0.072-0.792l-0.288-0.72l-0.071-0.504l-0.721-1.512l0.721-0.288l0.144-0.72l0.432-0.72l-1.008,0.504l-0.072-1.08l-0.792,0.36l0.144,0.792l-0.144-0.432l-0.72-0.576l0.145-0.72l1.367-1.44l0.792-0.648l0.288-0.576l1.152-1.512l-0.072-0.936l2.376-3.96l2.664-2.88l1.513-0.792h0.719l5.257-1.152l5.688-1.584l0.145,0.36l0.216,0.576l-0.145,0.792l0.576,0.792l0.072,1.728l0.288,0.792l0.72,0.72l0.216,0.72l-0.071,0.792l0.288,0.792l0.071,0.72l-0.288,0.36v1.512l0.504,1.512l0.433,0.72l0.433,1.512l-0.145,1.296l0.36,0.792l0.359-0.864l1.152,1.008l1.656,7.56l-0.072,0.504l0.504,0.72l-0.144,0.792l-0.072,
7.2l0.288,0.432l1.512,8.424l0.504,0.792v0.792l-1.224,1.224v0.288l0.432,0.432l0.36,0.36l-0.792,1.584l-0.072,0.864l-0.792,0.288l-0.36,0.792h-0.287l0.359-1.584l-0.072-1.152l-0.071-1.152l-0.36-1.152l-0.792-0.504l-0.216-0.72l-0.072,0.216l0.145,0.72l0.72,0.72l0.504,1.8l-7.775-2.52v-0.288l-0.864-0.36l-0.721-0.072l-1.367-0.576l-0.648-0.792l-0.144-0.72l-0.792-1.584l-0.792-0.648l-0.648,0.144l-0.36-0.72l-0.72-0.36l-0.072-0.144l-7.92,1.8l-11.952,2.52l-10.584,2.088l-6.912,1.224l-0.504-2.736L613.222,93.365z",
+ pa:"M607.39,97.757l1.008-0.576l1.513-1.224l0.72-0.792l0.072,0.216l2.52-2.016l0.072,0.288l0.504,2.736l6.912-1.224l10.584-2.088l11.952-2.52l7.92-1.8l0.072,0.144l0.72,0.36l0.36,0.72l0.648-0.144l0.792,0.648l0.792,1.584l0.144,0.72l0.648,0.792l1.367,0.576l0.721,0.072l0.864,0.36v0.288l-0.793,0.936l-0.288,0.72v0.72l-0.863,1.944l-0.72,0.72l0.287,0.576l0.288,0.144l0.36,0.72l-0.216,0.72l-0.576,0.72l0.216,1.224l0.648,0.792l0.792,0.288l0.144,0.72l0.721,0.504l0.432,0.144l0.72,0.72l1.728,1.296l-0.432,0.72l-0.863,0.792l-0.577,0.792l-0.216,0.072v0.072l-0.072,0.072l-0.575,0.648v0.72l-0.721,0.648l-0.72,0.216l-0.72,0.792l-0.288-0.216l-0.576-0.072l-0.72,0.144l-0.72,0.432l-0.433,0.72l-0.216,0.72l-17.137,3.672l-15.119,2.88l-9.145,1.656l-1.872-10.656l-2.592-15.12L607.39,97.757z",
+ nj:"M655.702,116.405l0.216-0.504l0.145-1.08l0.359-0.72l0.721-0.648l0.504-0.216l0.216-0.144l0.792-0.576v-0.072v-0.648l0.359-0.792l0.072-0.072v-0.072l0.216-0.072l0.577-0.792l0.863-0.792l0.432-0.72l-1.728-1.296l-0.72-0.72l-0.432-0.144l-0.721-0.504l-0.144-0.72l-0.792-0.288l-0.648-0.792l-0.216-1.224l0.576-0.72l0.216-0.72l-0.36-0.72l-0.288-0.144l-0.287-0.576l0.72-0.72l0.863-1.944v-0.72l0.288-0.72l0.793-0.936l7.775,2.52l0.072,0.792l-0.072,0.792l-0.288,1.08l0.071,0.504l-0.719,0.72l-0.217-0.072l-0.432,0.864v1.44v0.648l0.576,0.144l0.72-0.216l1.513,0.216l0.215,0.936v2.304l0.217,0.72l0.144,2.232l-0.072,0.792l-0.216-1.512l0.072-0.72l-0.288-0.648l-0.145,0.72l-0.287,0.144l0.287,0.72l0.145,1.152l-0.216,0.72l0.359,0.72l-0.288,0.72l-0.504,0.792l-0.144,0.864l-0.721,0.288l0.289,0.72l-0.504,0.72l0.359,0.648l-0.72,0.072l-0.576,0.72l-0.071,0.359l0.359,0.145l-0.359,0.721l-0.288,1.512l-0.504,0.792l-0.145,0.72l-0.433,0.576l-0.72,0.071l-0.071-0.792l0.288-1.224l-0.288-0.792h-1.513l-0.72,0.359l-1.296-1.007l-
0.721-0.36l-0.791-0.217l-1.44-1.223l0.145-0.361l-0.072-0.072l-0.432-0.72L655.702,116.405z",
+ de:"M653.326,115.757l0.216-0.72l0.433-0.72l0.72-0.432l0.72-0.144l0.576,0.072l0.288,0.216l-0.36,0.36l-0.071,0.72l-0.288,0.792l-0.36,0.504l0.576,0.72l-0.072,0.72l0.433,0.721l0.647,0.72l0.72,0.576l0.504,0.719l0.072,0.793l0.432,1.151l0.792,0.648l0.288,0.72l1.44,1.152l0.792-0.072l0.288,0.432l-0.288,0.72v0.721l0.359,0.071l-0.647,0.792l0.359-0.216l0.792-0.144l0.505,1.513h-0.216l-0.216,0.071l-5.328,1.225l-0.433-0.792l-1.224-5.112L653.326,115.757z",
+ md:"M621.07,122.309l15.119-2.88l17.137-3.672l2.448,8.496l1.224,5.112l0.433,0.792l5.328-1.225l-0.145,0.288l-0.359,0.288l0.72,0.648l-0.36,1.512l-0.359-0.216l-0.361,1.512l-0.575,0.72l0.071,0.72l-1.584,0.576l-0.72,0.721h-0.647l-1.44,0.504v-0.504l0.504-0.793l0.288-0.72l-0.72,0.288l-0.288-0.504l-0.72,0.432l-0.145-0.72l0.648-0.792l-0.504-0.216v-1.44l-0.648,1.513l-0.359-0.36v-0.72l-0.289,0.72l0.217,0.792l-0.648-0.288l-0.72-0.576l-0.721-0.359l0.217,0.72l-0.721-0.792v-0.792l0.36-1.439l-0.792,0.431l0.216-0.791l1.873,0.144l0.504-0.72l-0.721,0.359l-0.937-0.287l-0.288-0.72l-0.432-0.288l-0.72,0.144l-0.145,0.792l-0.359-0.721l0.144-0.791l0.72-0.289l0.721,0.576l-0.36-0.72l0.504-0.648l-0.72-0.071l-0.504-0.721l-0.216,0.288l-0.648,0.433l-0.144,0.72v-1.512l0.647-0.145l0.793-0.647l-0.145-0.288v-0.72l-0.288-0.072l-0.288,0.721l-0.504-0.793l0.36-2.231l0.647-0.72l0.72-0.145l0.721-0.359l-1.009-0.072l1.009-1.512l-0.217-0.289l-0.72,0.577l0.145-0.721l-0.432,0.216l-0.721,0.145l-0.072,0.432l0.504,0.792l-0.575,0.
721l-0.721,0.216l-0.071-0.721l-0.288,0.432v1.152l-0.648-0.792l-0.216,0.433l0.144,0.432l-0.071,0.936l-0.72-0.144l0.72,0.647h-0.72l-0.217-0.144l-0.792,0.216l1.8,1.08l-0.144,0.792l0.72,0.432l-0.288,0.072l-0.792-0.144l-0.144,0.144l0.576,0.432l-0.072,1.368l0.288,0.72l-0.216,0.721l0.432,0.72l0.432,1.656l1.44,1.44l-0.432,0.72l-0.36-0.504l-0.72-0.216l-0.792-0.505l-0.793-1.512l-0.215-0.72v0.432l0.504,1.513l0.504,0.72l1.08,0.576l0.792,0.647l0.72,0.288l0.936,1.439l-0.215,0.648l-0.721-0.575l-0.792-0.073l-0.216,0.145l-0.648-0.72l-0.72-0.072l-0.792,0.288l-0.721-0.72l-0.287-0.721l-0.145,0.433v0.72l-0.792-0.504l-0.575-0.72l-0.433-0.792l-0.72,0.288l-0.072,0.504l-0.576,0.792l-0.648-0.721l-0.144-0.792l0.216-0.72l0.216-0.144l0.433-0.72l0.071-0.721l0.577-0.72l-0.145-0.936l0.432-0.648l0.072-0.647l-0.863-0.576l-0.937,0.504l-0.647-0.145l-0.577-0.432l-0.792-0.36l-1.008,0.072l-0.792-0.504l0.145-0.721l-0.36-0.72l-0.72-0.504h-1.584l-0.144-0.432l-0.648-0.648l-0.072-0.792l-0.72-0.144l0.216-0.792l-0.072-0.072l-1.
512,0.145l-0.72-0.504l-0.792-0.288l-0.576,0.288l-0.36,0.791h-0.792l-0.648,0.792l-0.144,0.721l-1.151,0.144l-0.721-0.144l-0.792-0.721l-0.216,0.072l-0.072,0.72l-1.008,1.513l-0.72-0.145l-0.647,0.288l-0.289,0.72l-0.72,0.793l-0.432,0.719l-0.72,0.648l-0.648,0.792L621.07,122.309z",
+ va:"M589.318,164.645l1.439-1.008l0.792-0.145l0.72-0.576l1.801-0.719l0.144-0.793l0.72-0.576l0.721-0.359l0.576-0.72l0.071-0.721l0.864-0.647l0.072-0.793l0.504-0.791l2.592-1.944l2.88-3.384l-0.072,0.72l0.648,0.792l0.792,0.721l1.512,0.863l1.08,0.217l1.44-1.009l0.36-0.72l1.223,0.504l0.721-0.072l1.656-0.791l0.72-0.217l0.216-0.648v-0.719l1.152,0.359l1.439-1.224l0.792,0.144l1.44-1.008l0.145-0.145l-0.217-0.72l0.576-0.72l-0.576-0.792l0.288-1.368l0.792-1.513l0.721-1.008l0.359-1.512l0.072-0.792l0.504-0.72l0.432-1.513l0.288-0.287l0.144-0.793v-1.512l0.793-0.216l0.72,0.648l0.072,0.36l1.512,0.215l0.72-0.288l0.36-0.72l0.288-1.584l0.359-0.72l0.145-1.08l0.288-0.72l0.792,0.072l0.72-0.217l0.647-1.512l0.648-0.071l0.576-0.721l0.504-1.44l0.504-0.791l-0.071-1.512l0.288-0.793l-0.145-0.72l0.792-0.36l4.104,2.232l0.504-0.792l0.216-1.368h1.584l0.72,0.504l0.36,0.72l-0.145,0.721l0.792,0.504l1.008-0.072l0.792,0.36l0.577,0.432l0.647,0.145l0.647,0.359l0.36,0.792l0.072,0.433l0.216,0.791l-0.72,0.721l0.071,0.36l-0.215,
0.288l-0.217,0.071l-0.432-0.288l-0.288,2.232l0.144,0.72l-0.287,0.072l0.287,0.72l0.72,0.072l0.504-0.217l0.864-0.647h0.793v0.72l1.224,1.08l0.432,0.145l0.792-0.072l0.216,0.145l1.44-0.289l0.144,0.36l0.721,0.505v0.431h0.72v0.288l0.721,0.073l1.584,0.575v0.792l-0.721-0.144l0.433,0.72l0.071,0.792l-0.432,1.08l-0.793-0.288l-0.071-0.216l-0.721-0.072l-1.512-1.151l-0.504-0.073l-0.647-0.791l-0.72-0.288l-0.648-0.792l-0.792-0.648l-0.864-0.359l-0.72,0.072l0.648,0.071l1.512,0.937l0.432,0.72l0.433,0.432l0.791,0.36l0.576,0.792l1.512,0.72l0.217,0.432l0.72,0.576l0.721-0.071l0.792,0.647l-0.288,0.217l0.72,0.215l0.72-0.071l0.359,1.367l-0.144,0.721l-0.72-0.576l-0.721-0.145l-0.287,0.217l0.648,0.72l-0.361,0.792l-1.512-0.647l-1.439-1.297l-0.792-0.144l1.584,1.224l0.647,0.721l1.512,0.576l0.793-0.217l0.216,0.721l0.792,0.288l0.288,0.72l-0.216,0.791l-0.504,0.145l-0.36,0.433l-0.72-0.792l-0.793-0.289l-0.719-0.647l-0.576-0.792l-0.721,0.576l-0.72-0.432l-0.72-0.648l-0.072,0.792h-0.36l-0.792-0.647l-1.512,0.288l-0.721-0.14
5l-0.215,0.36h2.303l1.44,0.576l0.648-0.145l0.72,0.288l0.792-0.288l0.288,0.72l0.504,0.792l0.072-0.071l0.72,0.504l0.72,0.72l-0.215,0.72l0.792-0.72l0.575,0.072l0.721,0.359l-0.288-0.432l0.216-0.864l0.72,0.145l2.088-0.072l0.647,1.512l1.369,2.231l-0.289,0.072l-0.359-0.792l-0.721-0.576l0.072,0.792l0.216,0.721l-0.359,0.145l-0.433-0.361l0.217,0.361l-9.072,2.015l-10.296,2.089l-20.304,3.744l-7.416,1.079l-2.881,0.288l-1.512-0.071l-1.08,0.071l-2.952,0.72l-3.744,0.577l-6.264,0.936l-1.513,0.071L589.318,164.645z",
+ wv:"M596.014,142.109l0.072,0.071l0.72-0.145l1.08-0.504l0.576-0.72v-0.792l0.792-0.504l-0.145-1.44l-0.287-0.432l0.216-0.792l0.216-0.288v-0.792l0.288-0.72l0.504-0.792l0.72,0.288l0.792,1.152l0.288-0.793l0.432-0.72l-0.576-0.72l0.505-0.792v-0.792l0.287-0.72l1.081-0.576v-0.72l0.647-0.937l1.296,0.504l1.44-1.296l0.936-1.512l0.937-0.864l0.288-1.44l-0.072-0.792l0.144-0.72l-0.144-0.72l0.359-0.072l0.073-0.936l-0.145-0.792l0.359-2.232l0.289-0.792l-0.504-2.232l-0.504-0.648l0.215-0.72h0.36l0.504-0.36l1.872,10.656l9.145-1.656l1.008,6.048l0.648-0.792l0.72-0.648l0.432-0.719l0.72-0.793l0.289-0.72l0.647-0.288l0.72,0.145l1.008-1.513l0.072-0.72l0.216-0.072l0.792,0.721l0.721,0.144l1.151-0.144l0.144-0.721l0.648-0.792h0.792l0.36-0.791l0.576-0.288l0.792,0.288l0.72,0.504l1.512-0.145l0.072,0.072l-0.216,0.792l0.72,0.144l0.072,0.792l0.648,0.648l0.144,0.432l-0.216,1.368l-0.504,0.792l-4.104-2.232l-0.792,0.36l0.145,0.72l-0.288,0.793l0.071,1.512l-0.504,0.791l-0.504,1.44l-0.576,0.721l-0.648,0.071l-0.647,1.512l-0.72
,0.217l-0.792-0.072l-0.288,0.72l-0.145,1.08l-0.359,0.72l-0.288,1.584l-0.36,0.72l-0.72,0.288l-1.512-0.215l-0.072-0.36l-0.72-0.648l-0.793,0.216v1.512l-0.144,0.793l-0.288,0.287l-0.432,1.513l-0.504,0.72l-0.072,0.792l-0.359,1.512l-0.721,1.008l-0.792,1.513l-0.288,1.368l0.576,0.792l-0.576,0.72l0.217,0.72l-0.145,0.145l-1.44,1.008l-0.792-0.144l-1.439,1.224l-1.152-0.359v0.719l-0.216,0.648l-0.72,0.217l-1.656,0.791l-0.721,0.072l-1.223-0.504l-0.36,0.72l-1.44,1.009l-1.08-0.217l-1.512-0.863l-0.792-0.721l-0.648-0.792l0.072-0.72l-1.513-0.072l-1.512-1.08l-1.584-2.016l-0.72-0.721l-0.216-0.719l-1.584-1.656l0.36-1.44l-0.072-0.792l-0.288-0.36L596.014,142.109z",
+ oh:"M571.317,106.541l7.849-1.296l3.527-0.72l0.216,0.288l1.584,0.216l0.721,0.36l1.08,0.216l0.72,0.576l0.792,0.144l0.721-0.72l0.647,0.72l-1.151,0.288l-0.721,0.72l0.721,0.072l0.72-0.648h1.512l0.864,0.432l0.72,0.144l0.72-0.576l0.792-0.288l0.721-0.504l1.584-0.72l0.72,0.144l1.512-0.216l1.44-1.296l0.792-1.152l0.647-0.72l0.72-0.576l1.513-1.08l4.392-2.592l0.072,0.432l2.592,15.12l-0.504,0.36h-0.36l-0.215,0.72l0.504,0.648l0.504,2.232l-0.289,0.792l-0.359,2.232l0.145,0.792l-0.073,0.936l-0.359,0.072l0.144,0.72l-0.144,0.72l0.072,0.792l-0.288,1.44l-0.937,0.864l-0.936,1.512l-1.44,1.296l-1.296-0.504l-0.647,0.937v0.72l-1.081,0.576l-0.287,0.72v0.792l-0.505,0.792l0.576,0.72l-0.432,0.72l-0.288,0.793l-0.792-1.152l-0.72-0.288l-0.504,0.792l-0.288,0.72v0.792l-0.216,0.288l-0.216,0.792l0.287,0.432l0.145,1.44l-0.792,0.504v0.792l-0.576,0.72l-1.08,0.504l-0.72,0.145l-0.072-0.071l-0.575-0.721l-0.721-0.648l-0.72-0.071l-0.721-0.72l-0.576-1.296l-0.863,0.431l-0.792,0.721l-0.432,0.72h-0.721l-0.72,0.36l-0.721-0.648l-0
.936-0.144l-0.72,0.072l-0.504,0.72l-0.792,0.072l-1.513-1.225l-0.432-0.071l-1.512,0.144l-0.792-0.144l-1.152-1.513l-0.432-0.863l-1.801-0.721l-1.224,0.36l-0.72-0.504l-1.008,0.575l-2.232-19.583L571.317,106.541z",
+ 'in':"M547.558,155.285l-0.504-0.793l0.36-0.72l0.071-1.44l0.145-0.071l0.216-1.512l-0.145-0.145l0.145-0.792l0.72-0.647l0.576-0.721l0.936-1.583l0.072-0.792l0.792-1.44l0.217-0.145l0.144-0.791l-0.505-1.513l0.145-0.792l-0.648-0.72l-0.575-0.937l-0.072-0.792l0.432-0.792l-0.359-0.72l0.72-0.792l-2.592-27.288v-0.36l1.008,0.72l1.008,0.216l0.792-0.216l1.513-0.792l1.512-1.08h0.36l4.247-0.432l12.168-1.512l0.864,0.648l1.368,10.872l2.232,19.583l-0.36,0.36l0.504,0.937l-0.288,0.72l0.72,0.792l-0.144,0.72l-1.584,0.433l-1.439,1.152l-0.865-0.577l-0.719,0.288l-0.721,0.072l0.072,0.792l0.288,0.864l-0.216,0.792l-0.576,0.72l-0.792,0.432l-0.217,1.513l-0.72,0.648l-0.791-0.073l-0.505,1.513l0.072,0.792l-0.145,0.792l-0.72,0.433l-1.512-0.145l-0.721-0.288l-0.647-1.152l-0.72-0.359l0.36,0.72l-0.792,0.504l-0.576,0.721l0.072,0.791l-0.576,0.72l-0.145,0.792l-0.792-0.504l-0.72-0.144l-0.576-0.792l-0.648,0.576l-0.72,0.288l-0.504,0.72v0.288l-0.432,0.72l-0.721-0.576l-2.304-0.864l-0.721,0.36l-1.008,0.072l0.216,0.721l-0.72,0.2
87l-0.144-0.792l-0.72,0.433l-1.513-0.217l0.288,0.72l-0.432,0.721L547.558,155.285z",
+ il:"M514.869,127.349l0.504-0.504l0.072-0.792l-0.504-0.721l0.576-0.72l1.8-0.936l0.216-0.72v-0.792l0.144-0.504l1.081-1.44l-0.145-1.584l-1.368-1.44l0.216-1.512l0.289-0.792l2.808-0.576l0.72-0.576l1.512-0.576l0.721-0.648l0.144-1.584l1.009-1.368l0.287-2.304l-0.287-0.792l-0.721-0.72l-0.792-0.432l-0.72-0.576l-0.145-0.936l-1.512-1.152l-0.576-0.648l0.072-0.144l13.607-0.792l10.296-0.936h0.361l0.071,0.72l-0.071,1.512l0.144,0.72l0.792,1.44l0.72,0.648l0.216,1.152l0.433,0.792l0.216,0.72l0.792,1.152v0.36l2.592,27.288l-0.72,0.792l0.359,0.72l-0.432,0.792l0.072,0.792l0.575,0.937l0.648,0.72l-0.145,0.792l0.505,1.513l-0.144,0.791l-0.217,0.145l-0.792,1.44l-0.072,0.792l-0.936,1.583l-0.576,0.721l-0.72,0.647l-0.145,0.792l0.145,0.145l-0.216,1.512l-0.145,0.071l-0.071,1.44l-0.36,0.72l0.504,0.793v0.288l-0.288,0.72l-0.504,0.72l0.144,0.792l0.576,0.792l-0.504,0.72l-1.44,0.36l-0.791,0.504l-0.721,0.288l-0.216,0.72l0.144,0.792l0.577,0.721l0.216,0.72l-0.577,0.936l-0.72-0.145l-0.647-0.431l-1.44-0.433l-0.72-0.36l-0.79
2-0.144l-0.72,0.288l-1.081,1.44v0.792l0.433,0.432l-1.08-0.576l-0.72,0.359l-1.152-1.512l-0.936-1.512l0.504-0.792l0.145-0.792l-0.865-1.44l-0.144-1.655l-0.792-0.289l-0.72-0.504l-0.433-0.791l-1.296-0.793l-0.792,0.36l-0.144-0.936h-0.432l-2.232-1.513l-1.368-1.512l-0.145-0.72l0.072-0.792l0.433-0.72l0.36-1.296l0.575-1.152l-0.071-1.296l0.504-0.937v-0.287l-1.44-0.937l-0.72-0.071l-0.792-0.289l-0.36,0.072l-0.432,0.721l-0.792,0.215l-0.576-0.719l-0.792-3.312l-0.432-0.72l-0.721-0.577l-1.872-1.151l-0.288-0.72l-0.791-0.505l-0.721-0.792l-1.008-0.719l-0.216-0.721l-0.433-0.792l-0.432-1.512l-0.288-0.36l-0.288-1.512v-1.439l0.145-0.792L514.869,127.349z",
+ vt:"M659.302,50.525l2.88-0.864l11.881-3.096l-0.216,0.36l0.503,1.08l-0.432,1.512l0.145,0.792l0.576,0.72l0.288,0.72l-0.072,0.72l-0.576,1.08l-1.296,1.44l-0.288,0.072l-0.72,0.72l0.072,0.792l0.432,1.512l-0.288,1.296l0.145,0.792l-0.288,0.72l0.071,0.792l-0.216,0.72l-0.432,0.792l0.144,1.152l-0.359,0.72l0.647,2.592v1.512l0.433,2.232l-0.36,0.72v0.864l0.432,0.864l0.72,0.72l-6.552,1.368l-0.504-0.72l0.072-0.504l-1.656-7.56l-1.152-1.008l-0.359,0.864l-0.36-0.792l0.145-1.296l-0.433-1.512l-0.433-0.72l-0.504-1.512v-1.512l0.288-0.36l-0.071-0.72l-0.288-0.792l0.071-0.792l-0.216-0.72l-0.72-0.72l-0.288-0.792l-0.072-1.728l-0.576-0.792l0.145-0.792l-0.216-0.576L659.302,50.525z",
+ ct:"M666.646,84.365l4.968-1.08h0.721l1.439-0.504l0.432,0.072l0.792-0.36l4.32-1.08l1.008-0.216l0.504,0.072l1.656,5.904l0.145,0.792l-0.217,0.576l0.072,0.288l0.072,0.36l-0.433-0.144l-1.512,0.504l-1.512,0.936l-0.792-0.072v-0.36l-0.36-0.144l0.288,0.576v0.432l-2.304,0.576l-0.36,0.36h-0.792l-0.72,0.432l-0.792,0.144l-1.152,1.512l-0.432-0.288l-0.576,0.792l-0.792,0.432l-1.368,1.512l-0.72,0.288l-0.36-0.36l-0.432-0.432v-0.288l1.224-1.224v-0.792l-0.504-0.792L666.646,84.365z",
+ mi:"M518.973,54.269l0.721-0.432l2.232-1.008l1.367-1.512l0.792-0.432h0.792l0.721-0.216l0.792-0.072l0.72-0.288l0.721-0.504l0.792-0.792l1.512-0.648l0.432-0.72l1.584-1.8l0.504,0.72l0.504,0.288l1.224,1.512l-0.144,1.512l0.216,0.72l0.288-0.288l0.216-0.72l0.72-0.432l0.721-0.72l-0.647,1.512l0.359-0.216l0.504-0.72l0.721-0.288h1.512l0.792,0.144l0.72,0.648l0.72,0.144l0.433,0.792l1.367,1.44l0.433,0.792l0.792,0.36l0.72-0.072l1.728-0.648l0.721,0.648l0.792,0.144l0.72-0.072l0.648,0.288l1.151-1.512l1.513-0.936l0.72-0.72l1.296-0.288l0.721-0.288l3.023-0.216l0.721-0.216l1.439-0.864l0.72-0.288l1.44-0.216l0.072,2.664l0.359,0.648l1.439,0.216l1.513-0.576l0.504,0.72l0.72-0.36l0.433-0.648l0.071-0.072l0.576-0.144l0.648,0.72l0.432,0.792l0.217,0.72l0.071,0.792l0.72,0.504h0.217l0.72,0.36l0.071,0.72l0.793,0.36l0.432,0.72l-0.721,0.216l-3.527-0.072l-0.72,0.288l-0.721-0.432l-0.72,0.144l-0.216,0.792v1.368l-0.72-0.288l-1.584-1.296l-1.512-0.504l-0.721,0.072l-0.792-0.216l-1.44,0.216l-0.647,1.152l-0.72,0.432h-0.792l-1.
44,0.432l-0.72-0.072l-0.792,0.144l-0.576,0.36l-0.432,0.72l-0.072,0.864l-0.792,0.576l-0.721,0.72l-0.504,0.792l-0.72-0.072l0.36-0.936l0.72-0.576l0.072-0.792l-0.721-0.144l-0.719,0.288l-0.721,0.792l-0.144,0.432l-0.721,0.648l-0.432-0.72l-0.288-0.792l0.288-0.72l-0.648,1.08l-0.287,1.44l-0.648,0.792l-0.433,0.792l-0.432,1.512l-1.08,2.232l-0.792,1.224l0.072,0.72l-0.36-0.144h-0.072l-0.72-0.648l-0.072-0.72l0.433-1.512l-0.792,0.072l-0.72,0.216l-0.288-0.648l0.288-0.72l0.144-1.512l-0.36-0.72l0.217-0.216l-0.792-0.72l-1.152-0.36l-0.72-0.072l-0.145-1.368l-0.72-0.432l-1.944-0.216l-0.792-0.288l-0.72,0.216l-1.512-0.216l-0.288,0.072l-2.592-1.152l-7.92-1.512l-0.864-1.44l-0.72-0.576l-0.792-0.288L518.973,54.269zM553.678,107.837l0.287-0.216l0.721-0.72l0.504-0.792l0.36-0.72l0.647-2.232l0.792-1.512l0.288-0.792l0.433-2.736v-2.232l-0.433-3.024l-1.008-2.304l0.432-0.72l-0.72,0.288l-2.088-3.96l-0.144-0.72l0.288-0.72l0.503-0.792l-0.576-2.232l-0.431-0.72l0.071-0.72l0.648-0.792l0.864-2.232l0.071-0.792l-0.145-0.72l0.14
5-1.296l-0.432-1.44l0.72-0.576l0.648-0.72l-0.072-0.72l0.936-1.368l0.721,0.216l0.575-0.72l0.145-0.72l0.504-0.72l0.288-0.72l0.72-0.576l-0.216,2.088l-0.216,0.504l0.359,0.792l-0.288,0.72l0.145,0.72l0.504-0.72l0.217-1.512l0.287-0.072v1.512l-0.216,0.72l0.648-0.72l0.216-0.792l0.144-0.72v-0.864l-0.359-2.304l0.504-0.72l0.72-0.576l0.792-0.432h1.008l-0.071-0.648l-0.721-0.432l-0.359-0.792v-0.72l0.72-0.864l0.432-0.792l0.72-0.36l0.648-0.576l0.792,0.432l0.721,0.216l0.719,0.576h0.721l0.648-0.144l0.719,0.216l0.721,0.432l0.433,0.72l0.72,0.216h0.791l0.721,0.36l1.584,0.432l0.792,0.36h0.72l0.793,0.504l0.215,0.72l0.577,0.72l0.431,0.288v0.72l-0.719,0.144l-0.289,0.936l0.433,0.72l0.792,0.504l0.359,0.72l0.36,1.512l-0.071,1.512l0.288,2.376l-0.721,0.72l-0.72,0.432l-0.217,0.72l-0.071,1.512l-0.721,1.152l-0.792,0.144l-0.792,0.576l-0.144,1.512l0.072,1.152l0.936,0.864l0.793,0.072l0.719,0.288l0.577-0.792l0.359-0.72l0.721-0.576l0.359-1.296l-0.144-0.72l0.72-0.288l0.792-0.72l0.72-0.288l1.152-0.864l0.792,0.144l0.72,0.28
8l0.72,0.72l0.864,1.512l0.792,2.952l0.433,0.72l0.432,1.512l0.432,1.584l0.36,0.864l0.72,1.224h0.072l0.072,0.576l-0.216,0.288l-0.145,1.512l0.216,0.72l-0.144,1.584l-0.433,0.72l-0.504,0.216l0.144-0.216l-0.215-0.72l-0.36-0.504l-0.792,0.432l-0.144,0.648l-0.505,0.72l0.072,1.584l-0.576,0.72l-0.863,0.648l-0.073,0.144l-0.216,0.36l-0.215,0.72l-0.073,2.232l-1.296,2.232l-0.504,1.512l-3.527,0.72l-7.849,1.296l-0.864-0.648l-12.168,1.512l-4.247,0.432H553.678z",
+ nc:"M585.718,184.373v-3.024l1.512-0.433l0.648-0.719l0.145-1.009l0.287-0.792l0.647-0.72l1.513-0.864l1.513-0.072l0.647-0.287l2.088-2.088l1.44-1.009h0.72l0.432-0.72l0.288-1.513l0.792,0.217l0.145-0.721l0.288-0.359l0.72-0.433l0.72,0.721h0.504l0.72-0.792l0.288-0.721l0.72-0.575l1.44-0.576l0.648,0.504l0.72-0.792l0.504-1.584l0.648-0.72l0.72-0.289l0.288-1.367l-0.072-0.792l0.36-1.008l1.512,0.071l2.881-0.288l7.416-1.079l20.304-3.744l10.296-2.089l9.072-2.015l0.144,0.719l0.576,0.721l0.792,0.145v0.359l1.439,2.16l0.073,0.791l-0.577-1.008l-1.512-1.151l0.504,0.72l0.72,0.721h-0.936l-1.512-0.937l-0.792,0.144l0.72,0.217l0.792,0.647v0.647l-0.72,0.289l-0.792-0.289l0.576,0.721l-1.08-0.216h-0.72l0.791,0.504l-1.655,1.368l-0.793-0.288l-0.719,0.072l-0.721-1.44l0.072-0.721l-0.144-0.215l0.071-0.145l-0.359-0.432l0.288,0.576l-0.288,0.647l0.144,0.72l0.433,0.792l0.575,0.721l0.144,0.792l0.793-0.145l0.72-0.288l0.792-0.504l1.512,0.36l0.145-0.72l1.152-0.433l0.791,0.072l0.145,0.72v0.864l-0.36,0.72l0.72,0.288l-0.504,0.
721l0.288,0.359l0.72-0.72l-0.215-1.44v-0.792l1.079-0.144l0.144-0.504l-0.071-0.433l0.792,0.721l0.504,0.72l0.145,1.512l0.215,0.647l-0.647,0.721l-0.72-0.216v0.72l-1.009,2.305l-0.647,0.72l-1.656-0.072l-0.72-0.144l-0.432-0.721l-0.072,0.792l-0.792-0.216l-0.721-0.647l0.433-0.504l-0.72,0.071l0.072,0.721l0.288,0.72l-0.505-0.145l-0.72,0.288l-1.44-0.071l-1.584-0.433l-0.072,0.145l0.217,0.288l3.312,0.863h0.719l1.585,0.576l-0.288,0.792l-0.793,0.144l-0.215,0.576l0.72-0.144v0.72l-1.152,1.439l-0.504,0.36l-0.792-0.071l-0.863-0.648l-0.792-0.288l-0.648-0.432l0.575,0.72l1.225,1.151l1.512,0.145l1.513-0.937l0.72,0.36l-0.216-0.72l0.575-0.145l-0.071-0.071l0.216-0.721l0.359,0.721l-0.216,0.72l0.721-0.145l0.36-0.792l0.287-0.071l0.288,0.575l-0.288,0.792l-0.647,0.721l-0.648,1.439l-0.288,0.072l-0.791-0.504l-0.289,0.792l-0.359-0.792l-0.576,0.721l-0.072,0.359h-0.72l-1.8,0.937l-0.793-0.288l-0.719,1.439l-0.504,0.72l-0.217,0.145l-0.792-0.288l0.504-0.721l-0.72-0.287l0.359,0.504l-0.432,0.72l0.432,0.72l-1.584,1.369l-1.00
8,1.511l-0.648,1.513l-0.215,0.792v2.232l-0.504-1.801l-0.36-0.72h-0.144l0.504,1.512l-0.145,1.513l-0.721,0.504h-1.295l-1.44,0.359l-1.512,0.648l-0.433,0.071l-0.359-0.287l-11.952-8.496l-10.44,1.656l-0.216-0.217l-0.072-0.72l-0.288-0.792l-1.224-1.152l-0.72,0.288l-0.721-0.72l-3.167,0.216l-8.425,0.937l-0.72,0.216l-0.72,0.432l-1.513,0.505l-1.152,1.079l-0.791,0.072l-2.376,1.225L585.718,184.373z",
+ ma:"M666.574,75.941l6.552-1.368l9.576-2.232l0.937-1.08l0.432-0.792l0.216,0.072l0.505-0.792l0.791-0.504l0.36-0.072h0.36l-0.145,0.72l0.576,0.36l0.145,0.72l0.719,0.576l0.721-0.144l-0.145-0.144l0.721-0.144l-0.145,0.792l-1.439,1.008l-0.36,0.72l0.144,0.288l-0.647,0.792l0.359,0.72h-0.792l0.505,0.72l0.72,0.432l0.792-0.432l0.792,0.144l1.439,1.368l0.648,0.792l-0.72-0.36v0.72l0.72,0.36l0.721,0.144l0.72,1.44l0.432,0.288l0.792-0.072l0.721,0.216l1.512-1.152l0.648-0.72l-0.361-1.224l-0.647,0.072l-0.288-0.792l-0.792-0.504l-0.792-0.144l0.792-0.144l0.72,0.216l0.793,0.576l1.008,1.368l0.432,1.44l-0.432,0.792l-0.864,0.288l-2.231,1.224l-0.289-0.144l-0.215,0.792l-0.721,0.504l-0.792,0.288l-0.36-1.512v-0.72l-0.72,0.504l-0.359,0.72l-0.721,0.576l-0.432,1.224l-0.72-0.072l-0.504,0.792l-0.072-0.432l-0.36-1.08l-0.647-0.216l0.215-0.72v-0.792l-0.144,0.72l-0.575,0.432l-0.576-0.36l-0.072-0.072l-0.505-0.504l-0.071-0.576l-0.433-0.216l-0.287-0.72l-0.72-0.504l-2.881,0.864l-0.504-0.072l-1.008,0.216l-4.32,1.08l-0.792,0.3
6l-0.432-0.072l-1.439,0.504h-0.721l-4.968,1.08l-0.288-0.432l0.072-7.2L666.574,75.941z",
+ tn:"M529.197,189.916l0.072-0.215l0.72-0.433l0.36-0.72l0.72-0.217l0.145-0.287l-0.433-1.944l0.145-0.936l-0.721,0.216l0.145-0.793l0.72-0.287l0.288,0.504l0.288-0.647l-0.432-0.721l0.504-0.288l0.359-0.504l0.504-0.433l-0.575-0.72v-0.144l0.432-0.433l0.72-0.359l0.72-0.576l-0.432-0.792l0.792-0.288l-0.145-0.72l-0.287-0.432l0.504-1.225l0.432-0.72l-0.72-0.721l1.008-0.719l-0.432-0.792l0.792-0.288l-0.288-0.721l-0.145-0.792l0.648-0.071l-0.145,0.575l0.721-0.575l12.744-1.081l0.071-0.792l-0.504-1.439h1.584l0.864,0.288l3.889-0.505l3.744-0.287l4.68-0.648l4.535-0.216l4.608-0.433l2.521-0.431l4.104-0.217l3.024-0.288l2.951-0.432l3.312-0.217l1.009-0.359l2.879-0.433l1.513-0.071l6.264-0.936l3.744-0.577l2.952-0.72l1.08-0.071l-0.36,1.008l0.072,0.792l-0.288,1.367l-0.72,0.289l-0.648,0.72l-0.504,1.584l-0.72,0.792l-0.648-0.504l-1.44,0.576l-0.72,0.575l-0.288,0.721l-0.72,0.792h-0.504l-0.72-0.721l-0.72,0.433l-0.288,0.359l-0.145,0.721l-0.792-0.217l-0.288,1.513l-0.432,0.72h-0.72l-1.44,1.009l-2.088,2.088l-0.647,0.287l-
1.513,0.072l-1.513,0.864l-0.647,0.72l-0.287,0.792l-0.145,1.009l-0.648,0.719l-1.512,0.433v3.024l-3.744,0.288l-8.496,1.079l-10.584,1.225l-13.68,1.08l0.071,0.287l-0.144-0.071l-6.912,0.647L529.197,189.916z",
+ ar:"M487.941,174.148l9.287-0.216l14.761-0.647l16.849-1.08l0.72,0.432l0.576,0.72l0.216,0.72v0.793l-0.576,0.719l-0.792,0.433l-0.576,0.792l-0.36,0.72l0.36,0.792l5.4-0.575l0.287,0.432l0.145,0.72l-0.792,0.288l0.432,0.792l-0.72,0.576l-0.72,0.359l-0.432,0.433v0.144l0.575,0.72l-0.504,0.433l-0.359,0.504l-0.504,0.288l0.432,0.721l-0.288,0.647l-0.288-0.504l-0.72,0.287l-0.145,0.793l0.721-0.216l-0.145,0.936l0.433,1.944l-0.145,0.287l-0.72,0.217l-0.36,0.72l-0.72,0.433l-0.072,0.215l0.288,0.217l0.145,0.792l-0.721,0.648l-0.792,0.359l-0.359-0.504l0.216,1.655l-0.576,0.073l-0.216-0.793v1.08l0.72,0.433l-0.72,0.359l-0.217-0.72l-0.071,1.152l0.504,0.359l-0.433,0.937l0.145,0.576l-0.576,0.791l-0.432,0.217h-0.721l0.145,0.72l-0.72,0.72l-0.144,0.432l-0.793-0.215l0.504,0.575l-0.288,0.216v0.72l0.36,0.721l-1.872,0.792l0.504,0.433l-0.144,0.792l0.144,0.647l-0.144,0.432h-0.793v0.576l0.793,0.216l-0.72,0.433l-0.217-0.288l-0.504,0.288l0.576,0.792l-0.72,0.504l0.504,0.72l-0.432,0.792l0.719-0.648l0.433,0.504l-0.72,0.504l0
.72,0.217l0.072-0.072l-0.216,0.647l0.288,0.864l0.216,0.145l0.216,1.224l-0.072,0.144h-0.72l0.144,0.648l-0.071,1.009l-15.841,0.863l-12.023,0.433l-0.216-6.337l-2.377-0.432l-0.792,0.504l-0.72-0.575l-0.072-0.289l-0.287-0.215l-0.145-20.448l-0.36-3.24L487.941,174.148z",
+ ms:"M522.43,213.749l0.071-1.009l-0.144-0.648h0.72l0.072-0.144l-0.216-1.224l-0.216-0.145l-0.288-0.864l0.216-0.647l-0.072,0.072l-0.72-0.217l0.72-0.504l-0.433-0.504l-0.719,0.648l0.432-0.792l-0.504-0.72l0.72-0.504l-0.576-0.792l0.504-0.288l0.217,0.288l0.72-0.433l-0.793-0.216v-0.576h0.793l0.144-0.432l-0.144-0.647l0.144-0.792l-0.504-0.433l1.872-0.792l-0.36-0.721v-0.72l0.288-0.216l-0.504-0.575l0.793,0.215l0.144-0.432l0.72-0.72l-0.145-0.72h0.721l0.432-0.217l0.576-0.791l-0.145-0.576l0.433-0.937l-0.504-0.359l0.071-1.152l0.217,0.72l0.72-0.359l-0.72-0.433v-1.08l0.216,0.793l0.576-0.073l-0.216-1.655l0.359,0.504l0.792-0.359l0.721-0.648l-0.145-0.792l-0.288-0.217l13.032-1.008l6.912-0.647l0.144,0.071l0.36,0.505l0.72,0.432l-0.647,35.352l2.304,17.353l0.072,0.359l-0.432,0.792l-1.513-0.575l-0.216,0.288l-0.72,0.287l-0.721-0.216l-0.792-0.576l-1.224,0.145l1.08,0.072l-0.36,0.215l-1.512,0.289l-1.513,0.647l-0.72,0.072l0.145-0.145l-0.648,0.145l0.145,0.072l-0.217,0.36l-0.792,0.647l-0.288,0.72l-0.72,0.072l-0.35
9-0.217l-0.504-0.359l-0.433-0.72l0.072-0.36l-0.432-0.72l-0.217-0.792l-1.079-0.936l-0.433-0.721l-0.288-0.792l0.288-1.296l0.504-1.513l0.145-0.792l-0.072-0.144l-9.36,0.72l-9.792,0.576l0.721-0.791l-0.504-0.721l0.144-0.792l-0.505-0.792l1.08-0.216l0.217-0.576l-0.648-0.72l0.864-0.072l-0.359-1.512l0.72-0.576l0.144-0.288l-0.72-0.072l0.792-0.504l0.144-0.72l0.721-0.721l-0.504-0.359l0.288-0.72l0.647-0.288l1.728-1.872l-0.071-0.145l-0.721-0.287l0.721-0.072l0.071-0.288l0.577-0.864l-0.793,0.145l-0.72-0.145l0.432-0.72l0.792-0.288l0.576-0.72h0.576l0.072-0.216l-0.145-0.145l-0.72-0.216l-0.216-0.576l-0.721-0.359l-0.359-0.721l0.072-0.145l0.72,0.217l-0.504-0.721l0.576-0.719l-1.296,0.215l-0.217-0.504l0.864-0.936l-0.864-0.433l-0.071-0.791l0.647-0.648l-0.072-0.72l-0.575-0.145l-0.721,0.504l0.144-0.72L522.43,213.749z",
+ ga:"M573.478,185.74l8.496-1.079l3.744-0.288l11.521-1.8l-0.145,0.575l-1.439,2.088l-0.216,0.792l0.359,0.721l0.792,0.432l0.72,0.144l1.44,1.152l1.08-0.145l0.792,0.648l0.36,0.721l0.719,0.863l0.288,0.721l1.944,2.376l1.513,1.008l1.439,0.72l0.72,0.792l0.504,0.864l0.505,0.432l0.791,0.144l1.08,0.864l0.648,0.36l-0.071,0.504l0.288,0.72l0.792,0.432l0.144,0.721l0.792,0.287v0.145l0.72,0.721l0.72,0.215l1.584,0.937l0.072,0.721l0.864,1.151l0.359,0.792v0.72l0.217,0.793l0.72,0.504l1.08,0.432l0.575,0.792l0.361,0.792l0.575,0.792l-0.072,0.72l0.145,0.721l0.504,0.719l1.512,0.217l0.36,0.216l0.36,0.145l0.575,0.071l-0.359,0.721l-0.72,0.504l0.071,0.72l-0.72,0.072l-0.721-0.36v0.792l0.721,0.504l-0.576,0.864l-0.792,0.144l0.144,0.72l0.721-0.288l0.072,0.36l-0.289,0.792l-0.791-0.504l0.359,0.72l-0.72,0.648l0.36,0.359l0.72-0.215l-0.504,1.439l-0.433-0.072v0.792h-0.72l-0.72-0.216l-0.217,0.072l0.721,0.36h0.72l0.792,0.287l-0.216,0.721l-0.647,1.151l-0.721-0.432l-0.287,0.72l1.008,0.072l-0.36,0.792l-0.721-0.433l0.721,0.648
l-0.433,0.72h0.504l-0.359,0.72l-0.145,0.721l0.504,0.72l-0.071,0.792l-0.36,0.072l-0.36,0.071l-0.72-0.071l-1.943-0.433l-0.792-0.288l-0.576,0.577h-0.36l-0.216,0.792l0.071,0.72l0.433,0.72l0.145,0.72l-0.072,1.584l-0.72,0.504l-0.721-0.071l-0.575-1.513l-0.792-0.504l-25.704,1.872l-0.577-0.72l-0.144-0.72l-1.08-1.656v-0.36l-0.648-1.152l-0.575-0.719l-0.217-0.793l0.217-1.656l-0.072-0.719l0.216-0.721l-0.36-1.08l-0.575-0.792l-0.504-1.44l0.216-1.439l0.288-0.792l-0.072-1.44l0.432-0.72l0.72-0.575l-0.144-0.721l-0.72-0.36l0.144-1.151l-0.359-0.864l-0.144-0.288l-0.937-0.863l-0.576-1.44l-0.504-0.792l-0.216-0.792l-0.216-0.36l-3.528-12.744L573.478,185.74z",
+ sc:"M597.238,182.573l2.376-1.225l0.791-0.072l1.152-1.079l1.513-0.505l0.72-0.432l0.72-0.216l8.425-0.937l3.167-0.216l0.721,0.72l0.72-0.288l1.224,1.152l0.288,0.792l0.072,0.72l0.216,0.217l10.44-1.656l11.952,8.496l0.359,0.287v0.433l-0.72,0.433l-1.656,1.728l-1.584,2.952l-0.36,0.792l-0.071,2.447l-0.288-0.72l-0.721-0.288l0.505-1.512l-0.216,0.144l-0.432,0.792l-0.072,0.864l0.72,0.504l0.575,0.72l-0.647,0.721l-0.72-0.217l0.576,0.288l-0.576,0.793l-0.288,0.719l-0.721,0.217l-0.72-0.217l-0.504,0.721l0.288,0.792l-0.504,0.36l-0.432,0.72l-0.648,0.72l-0.72,0.145l-0.288-0.72h-0.648l0.288,1.079l0.721,0.288l-0.36,0.792l-0.72,0.36l0.071,0.432l-0.864,0.216l-0.719,0.576l-0.721-0.359l0.504,0.359l-0.72,0.72l-0.72,0.072l-0.721,0.36l-0.936-0.216l-1.439,0.647l0.575-0.072l0.72,0.36h0.793l0.287,0.36l-0.504,0.72l0.721-0.72l-0.36,1.224l-0.792,0.576l-0.721-0.433l-0.504-1.367l-0.071,1.512l-0.721-0.648l-0.359-0.72l-0.576-0.575l0.72,1.439l0.216,0.72l0.36,0.505l0.72,0.575l-0.503,0.721l-0.505,0.071v-0.72l-0.288,0.72l-0.
359,1.513l-0.36-0.145l-0.36-0.216l-1.512-0.217l-0.504-0.719l-0.145-0.721l0.072-0.72l-0.575-0.792l-0.361-0.792l-0.575-0.792l-1.08-0.432l-0.72-0.504l-0.217-0.793v-0.72l-0.359-0.792l-0.864-1.151l-0.072-0.721l-1.584-0.937l-0.72-0.215l-0.72-0.721v-0.145l-0.792-0.287l-0.144-0.721l-0.792-0.432l-0.288-0.72l0.071-0.504l-0.648-0.36l-1.08-0.864l-0.791-0.144l-0.505-0.432l-0.504-0.864l-0.72-0.792l-1.439-0.72l-1.513-1.008l-1.944-2.376l-0.288-0.721l-0.719-0.863l-0.36-0.721l-0.792-0.648l-1.08,0.145l-1.44-1.152l-0.72-0.144l-0.792-0.432l-0.359-0.721l0.216-0.792l1.439-2.088L597.238,182.573z",
+ ky:"M536.182,171.701l0.216-0.937l0.792-0.36l0.792,0.288l0.36-1.08l-0.36-0.72l0.72-0.576l-0.216-1.08l0.145-0.792l-0.145-0.647l-0.433-0.432v-0.792l1.081-1.44l0.72-0.288l0.792,0.144l0.72,0.36l1.44,0.433l0.647,0.431l0.72,0.145l0.577-0.936l-0.216-0.72l-0.577-0.721l-0.144-0.792l0.216-0.72l0.721-0.288l0.791-0.504l1.44-0.36l0.504-0.72l-0.576-0.792l-0.144-0.792l0.504-0.72l0.288-0.72v-0.288l0.792,0.144l0.432-0.721l-0.288-0.72l1.513,0.217l0.72-0.433l0.144,0.792l0.72-0.287l-0.216-0.721l1.008-0.072l0.721-0.36l2.304,0.864l0.721,0.576l0.432-0.72v-0.288l0.504-0.72l0.72-0.288l0.648-0.576l0.576,0.792l0.72,0.144l0.792,0.504l0.145-0.792l0.576-0.72l-0.072-0.791l0.576-0.721l0.792-0.504l-0.36-0.72l0.72,0.359l0.647,1.152l0.721,0.288l1.512,0.145l0.72-0.433l0.145-0.792l-0.072-0.792l0.505-1.513l0.791,0.073l0.72-0.648l0.217-1.513l0.792-0.432l0.576-0.72l0.216-0.792l-0.288-0.864l-0.072-0.792l0.721-0.072l0.719-0.288l0.865,0.577l1.439-1.152l1.584-0.433l0.144-0.72l-0.72-0.792l0.288-0.72l-0.504-0.937l0.36-0.36l1.
008-0.575l0.72,0.504l1.224-0.36l1.801,0.721l0.432,0.863l1.152,1.513l0.792,0.144l1.512-0.144l0.432,0.071l1.513,1.225l0.792-0.072l0.504-0.72l0.72-0.072l0.936,0.144l0.721,0.648l0.72-0.36h0.721l0.432-0.72l0.792-0.721l0.863-0.431l0.576,1.296l0.721,0.72l0.72,0.071l0.721,0.648l0.575,0.721l0.072,0.503l0.288,0.36l0.072,0.792l-0.36,1.44l1.584,1.656l0.216,0.719l0.72,0.721l1.584,2.016l1.512,1.08l1.513,0.072l-2.88,3.384l-2.592,1.944l-0.504,0.791l-0.072,0.793l-0.864,0.647l-0.071,0.721l-0.576,0.72l-0.721,0.359l-0.72,0.576l-0.144,0.793l-1.801,0.719l-0.72,0.576l-0.792,0.145l-1.439,1.008l-1.009,0.359l-3.312,0.217l-2.951,0.432l-3.024,0.288l-4.104,0.217l-2.521,0.431l-4.608,0.433l-4.535,0.216l-4.68,0.648l-3.744,0.287l-3.889,0.505l-0.864-0.288h-1.584l0.504,1.439l-0.071,0.792L536.182,171.701z",
+ al:"M549.285,188.332l-0.071-0.287l13.68-1.08l10.584-1.225l3.528,11.088l3.528,12.744l0.216,0.36l0.216,0.792l0.504,0.792l0.576,1.44l0.937,0.863l0.144,0.288l0.359,0.864l-0.144,1.151l0.72,0.36l0.144,0.721l-0.72,0.575l-0.432,0.72l0.072,1.44l-0.288,0.792l-0.216,1.439l0.504,1.44l0.575,0.792l0.36,1.08l-0.216,0.721l0.072,0.719l-0.217,1.656l0.217,0.793l0.575,0.719l0.648,1.152v0.36l-15.624,1.872l-9.288,0.936l-0.72,0.576l-0.217,0.936l1.153,1.513l0.72,0.36l0.72,0.72l-0.36,1.079l0.145,0.361l0.144,0.359l-0.216,1.368l-0.721,0.647l-0.792-0.144l0.145,0.216l-0.216,0.72l-0.792,0.288l-2.952,0.504l0.504-0.359l0.72,0.071l0.792-0.287l0.145-0.721l-0.504-0.792l-0.216,0.145l-0.792-0.432l-0.36-0.721l0.288-0.72l-0.145-0.72l-0.432-0.721l-0.36-0.072l-0.432-0.576l0.072,0.361l-0.288,0.647l-0.144,0.792l-0.145,2.664h-0.72l-1.44-0.288l-0.72,0.144l-0.072-0.359l-2.304-17.353l0.647-35.352l-0.72-0.432L549.285,188.332z",
+ la:"M494.565,215.045l12.023-0.433l15.841-0.863l-0.289,0.359l-0.144,0.72l0.721-0.504l0.575,0.145l0.072,0.72l-0.647,0.648l0.071,0.791l0.864,0.433l-0.864,0.936l0.217,0.504l1.296-0.215l-0.576,0.719l0.504,0.721l-0.72-0.217l-0.072,0.145l0.359,0.721l0.721,0.359l0.216,0.576l0.72,0.216l0.145,0.145l-0.072,0.216h-0.576l-0.576,0.72l-0.792,0.288l-0.432,0.72l0.72,0.145l0.793-0.145l-0.577,0.864l-0.071,0.288l-0.721,0.072l0.721,0.287l0.071,0.145l-1.728,1.872l-0.647,0.288l-0.288,0.72l0.504,0.359l-0.721,0.721l-0.144,0.72l-0.792,0.504l0.72,0.072l-0.144,0.288l-0.72,0.576l0.359,1.512l-0.864,0.072l0.648,0.72l-0.217,0.576l-1.08,0.216l0.505,0.792l-0.144,0.792l0.504,0.721l-0.721,0.791l9.792-0.576l9.36-0.72l0.072,0.144l-0.145,0.792l-0.504,1.513l-0.288,1.296l0.288,0.792l0.433,0.721l1.079,0.936l0.217,0.792l0.432,0.72l-0.072,0.36l0.433,0.72l0.504,0.359l0.359,0.217l-0.863,0.359l-0.072-0.215l-0.216,0.144l-0.792-0.072l-0.72-0.648l-0.288,0.216l-0.504-0.287h-0.721l-0.72-0.648l-0.792-0.504l-1.009-0.144l-0.719,0.216
l-1.009,1.584l-0.647,0.72l0.071,0.72l0.937,0.433h1.152l2.159-0.217l0.72-0.288l0.648-0.719l0.721,0.432l0.504-0.721l0.071,0.721l0.792-0.505l0.145,0.073l-0.36,0.791l-1.584,0.937l0.071,0.216l0.577,0.504l0.72-0.145l0.36,0.721h0.72l0.288-0.721l0.071-0.792l1.152-0.792l0.216,0.721l0.072,0.863l0.647,0.361v0.719l-0.215,0.793l-0.217-0.216l-0.72-0.145l-0.792,0.72l0.359,0.721l0.504,0.575l-0.72-0.287l-0.792,0.071l0.216,0.504l-0.72,0.288l0.288,0.792l0.864,0.216l0.792,0.36l0.359,0.792l0.937-0.071l0.792,0.431l1.44,0.217l0.647,0.432l0.36,0.72l0.72,0.216l0.072,0.217l-0.72,0.216l0.071,0.433l-0.36,0.792l-0.144,0.719l-1.008-1.223l-0.576,0.792l-0.288,0.72l-0.72,0.72l0.576-1.513l0.504-0.719l-0.36-0.792l-0.072,0.936l-0.72-0.144l-0.504-0.792l-0.216-0.721l-0.721,0.216l-0.863-0.144l-0.504-0.792l-0.72,0.216h-0.792l0.504-0.792l-0.36-0.288l-0.72-0.36l-0.72-0.144l-2.665-1.08l-0.072,0.072l0.145,0.72l1.512,0.864l0.217,1.44l-0.72,0.215l0.503,0.721l-0.359,0.72l-0.721,0.576l-0.647,0.288l-0.36-0.72l0.072-1.152l-0.792-0.
217l-0.72,0.288l-0.288-0.792l-0.36,0.145l-0.72,0.288l-0.792,0.071l-0.217,0.792v1.009l-0.575,0.36l-0.792-0.433h-0.217l-0.791,0.36l-1.44-0.936l-0.792,0.287l-0.576-0.359l0.217-0.72l-0.36-0.792l-0.792-0.505l-0.504-0.72l0.071-0.792l0.145-0.072l-0.145-0.72v0.576l-0.216,0.071l-0.432,0.721l-1.44-0.505h-0.792l-0.287-1.079l-0.721-0.36l-0.216-0.792l-1.513,0.145l-0.719,0.216l-0.073-0.433l0.145-0.792l-1.512,0.505l-0.792,0.359l-0.288,0.288l-0.792,0.072l0.72,0.575l0.504,1.152h-0.72l-1.08,0.576l-0.721,0.072l-3.743-0.576l-1.296-0.433l-0.792-0.432l-1.513-0.576l-1.512-0.359l-0.792-0.072l-0.72-0.288l0.216-0.359l0.72-0.36v-0.72l-0.287-0.721l-0.648-0.72l-0.144,1.872l-0.721,0.575l0.721,0.505l-0.288,0.432l-3.528,0.36l-0.721,0.504l-0.791-0.576l0.144-0.792l0.72-0.359l0.288-0.792l-0.288-0.792h-0.072l0.072-0.073l0.72-0.791l0.217-0.864l-0.36-1.8l-0.36-0.936l0.504-0.793l-0.215-1.439l0.359-0.793l0.576-0.719l0.144-0.792l0.432-0.721l-0.144-0.792l0.288-0.72l-0.288-0.721l0.36-0.575l-0.217-0.792l0.073-0.721l-0.289-0.0
71l-1.224-1.513v-0.791l-0.36-0.721l-0.288-0.144l-0.359-0.793l-0.576-0.719l0.145-1.152l-0.576-1.512l-0.504-0.721l-1.296-1.152L494.565,215.045z",
+ mo:"M476.709,126.053l9.792,0.071l6.192-0.144l13.535-0.792l5.833-0.647
<TRUNCATED>
[04/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
don't dispatch change event if nothing changed
Posted by ah...@apache.org.
don't dispatch change event if nothing changed
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2e43d443
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2e43d443
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2e43d443
Branch: refs/heads/core_js_to_as
Commit: 2e43d44398eb643d6de51020d0ea7949e3388f5d
Parents: c9bd62d
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 8 23:20:25 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:16 2015 -0700
----------------------------------------------------------------------
.../src/org/apache/flex/html/beads/models/ArraySelectionModel.as | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2e43d443/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
index cf692fc..2e655a4 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
@@ -138,6 +138,8 @@ package org.apache.flex.html.beads.models
*/
public function set selectedIndex(value:int):void
{
+ if (value === _selectedIndex) return;
+
_selectedIndex = value;
_selectedItem = (value == -1 || _dataProvider == null) ? null : (value < _dataProvider.length) ? _dataProvider[value] : null;
dispatchEvent(new Event("selectedIndexChanged"));
@@ -185,6 +187,8 @@ package org.apache.flex.html.beads.models
*/
public function set selectedItem(value:Object):void
{
+ if (value === _selectedItem) return;
+
_selectedItem = value;
var n:int = _dataProvider.length;
for (var i:int = 0; i < n; i++)
[07/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
need binding event
Posted by ah...@apache.org.
need binding event
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/019e958a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/019e958a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/019e958a
Branch: refs/heads/core_js_to_as
Commit: 019e958af1c782669998a79d8070887d7d260263
Parents: e16eeb4
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:08:54 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:17 2015 -0700
----------------------------------------------------------------------
frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as | 1 +
.../projects/Core/as/src/org/apache/flex/core/UIButtonBase.as | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/019e958a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
index f7ebd20..3f00b32 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
@@ -547,6 +547,7 @@ package org.apache.flex.core
/**
* @private
*/
+ [Bindable("visibleChanged")]
override public function set visible(value:Boolean):void
{
super.visible = value;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/019e958a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
index 5aa6de5..911176a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
@@ -478,6 +478,7 @@ package org.apache.flex.core
/**
* @private
*/
+ [Bindable("visibleChanged")]
override public function set visible(value:Boolean):void
{
super.visible = value;
[39/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
- Streamlined the maven configuration (Moved the identical configuration
parts to the parent pom)
Posted by ah...@apache.org.
- Streamlined the maven configuration (Moved the identical configuration parts to the parent pom)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/996daefe
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/996daefe
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/996daefe
Branch: refs/heads/core_js_to_as
Commit: 996daefe1b89b418d2fd83906e2ddcf3c3b44d37
Parents: 40c4c14
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 22 23:19:08 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 22 23:19:08 2015 +0200
----------------------------------------------------------------------
examples/flexjs/ChartExample/pom.xml | 24 ----------
examples/flexjs/CordovaCameraExample/pom.xml | 24 ----------
examples/flexjs/DataBindingExample/pom.xml | 24 ----------
examples/flexjs/DataBindingExample_Flat/pom.xml | 24 ----------
examples/flexjs/DataBindingExample_as/pom.xml | 24 ----------
examples/flexjs/DataGridExample/pom.xml | 24 ----------
examples/flexjs/DesktopMap/pom.xml | 24 ----------
examples/flexjs/FlexJSStore/pom.xml | 24 ----------
examples/flexjs/FlexJSStore_jquery/pom.xml | 24 ----------
examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 24 ----------
examples/flexjs/MapSearch/pom.xml | 24 ----------
examples/flexjs/MobileTrader/pom.xml | 24 ----------
examples/flexjs/TodoListSampleApp/pom.xml | 24 ----------
examples/flexjs/pom.xml | 49 ++++++++++++++++++--
14 files changed, 44 insertions(+), 317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/ChartExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ChartExample/pom.xml b/examples/flexjs/ChartExample/pom.xml
index 4bdc4c2..7a44be8 100644
--- a/examples/flexjs/ChartExample/pom.xml
+++ b/examples/flexjs/ChartExample/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>ChartExample.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/CordovaCameraExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/pom.xml b/examples/flexjs/CordovaCameraExample/pom.xml
index cd96b8d..8252b32 100644
--- a/examples/flexjs/CordovaCameraExample/pom.xml
+++ b/examples/flexjs/CordovaCameraExample/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>CordovaCameraExample.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/DataBindingExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/pom.xml b/examples/flexjs/DataBindingExample/pom.xml
index 785043f..286e2ae 100644
--- a/examples/flexjs/DataBindingExample/pom.xml
+++ b/examples/flexjs/DataBindingExample/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>DataBindingExample.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/DataBindingExample_Flat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/pom.xml b/examples/flexjs/DataBindingExample_Flat/pom.xml
index 29888a6..4132933 100644
--- a/examples/flexjs/DataBindingExample_Flat/pom.xml
+++ b/examples/flexjs/DataBindingExample_Flat/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>DataBindingExample.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/DataBindingExample_as/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_as/pom.xml b/examples/flexjs/DataBindingExample_as/pom.xml
index 357b169..1b19654 100644
--- a/examples/flexjs/DataBindingExample_as/pom.xml
+++ b/examples/flexjs/DataBindingExample_as/pom.xml
@@ -42,8 +42,6 @@
<extensions>true</extensions>
<configuration>
<sourceFile>DataBindingExample.as</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
<defines>
<property>
<name>CONFIG::as_only</name>
@@ -55,30 +53,8 @@
</property>
</defines>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/DataGridExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataGridExample/pom.xml b/examples/flexjs/DataGridExample/pom.xml
index d534c23..2c221a3 100644
--- a/examples/flexjs/DataGridExample/pom.xml
+++ b/examples/flexjs/DataGridExample/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>DataGridExample.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/DesktopMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/pom.xml b/examples/flexjs/DesktopMap/pom.xml
index cb9cd7c..e43ce23 100644
--- a/examples/flexjs/DesktopMap/pom.xml
+++ b/examples/flexjs/DesktopMap/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>DesktopMap.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/FlexJSStore/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/pom.xml b/examples/flexjs/FlexJSStore/pom.xml
index 1f63742..def30f6 100644
--- a/examples/flexjs/FlexJSStore/pom.xml
+++ b/examples/flexjs/FlexJSStore/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>FlexJSStore.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/FlexJSStore_jquery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/pom.xml b/examples/flexjs/FlexJSStore_jquery/pom.xml
index f72ddc9..4cbea24 100644
--- a/examples/flexjs/FlexJSStore_jquery/pom.xml
+++ b/examples/flexjs/FlexJSStore_jquery/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>FlexJSStore.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
index 02414b8..b023de7 100644
--- a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
+++ b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>FlexWebsiteStatsViewer.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/MapSearch/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/pom.xml b/examples/flexjs/MapSearch/pom.xml
index c449848..7624a65 100644
--- a/examples/flexjs/MapSearch/pom.xml
+++ b/examples/flexjs/MapSearch/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>MapSearch.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/MobileTrader/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/pom.xml b/examples/flexjs/MobileTrader/pom.xml
index 26aee5d..9c867a0 100644
--- a/examples/flexjs/MobileTrader/pom.xml
+++ b/examples/flexjs/MobileTrader/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>MobileTrader.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/TodoListSampleApp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TodoListSampleApp/pom.xml b/examples/flexjs/TodoListSampleApp/pom.xml
index 2aac2a8..473d363 100644
--- a/examples/flexjs/TodoListSampleApp/pom.xml
+++ b/examples/flexjs/TodoListSampleApp/pom.xml
@@ -42,33 +42,9 @@
<extensions>true</extensions>
<configuration>
<sourceFile>TodoListSampleApp.mxml</sourceFile>
- <compilerName>${flexmojos-compiler-name}</compilerName>
- <debug>true</debug>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.compiler</groupId>
- <artifactId>falcon-jx-compiler</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs</groupId>
- <artifactId>framework</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>18.0</version>
- <type>swc</type>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/996daefe/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index 8069bbb..77bb498 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -34,16 +34,11 @@
<!--flexmojos-compiler-name>FlexJS</flexmojos-compiler-name-->
</properties>
-
<modules>
<module>ChartExample</module>
<module>CordovaCameraExample</module>
<module>DataBindingExample</module>
<module>DataBindingExample_as</module>
- <!--
- This tag could not be resolved to an ActionScript class. It will be ignored.
- <js:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
- -->
<module>DataBindingExample_Flat</module>
<module>DataGridExample</module>
<module>DesktopMap</module>
@@ -65,6 +60,50 @@
<module>TodoListSampleApp</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ <defines>
+ <property>
+ <name>CONFIG::theme</name>
+ <value>false</value>
+ </property>
+ </defines>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
<repositories>
<!--
[23/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
fix vertical align
Posted by ah...@apache.org.
fix vertical align
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e945a9e3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e945a9e3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e945a9e3
Branch: refs/heads/core_js_to_as
Commit: e945a9e30f1f26d48331b3896717b73e8d9039e1
Parents: 8677a78
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 15 15:09:48 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 15 15:09:48 2015 -0700
----------------------------------------------------------------------
.../flex/html/beads/layouts/HorizontalLayout.as | 109 +++++++++----------
1 file changed, 49 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e945a9e3/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
index 986359e..58ed8f6 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
@@ -145,11 +145,13 @@ package org.apache.flex.html.beads.layouts
lastmr = mr;
var marginObject:Object = {};
verticalMargins[i] = marginObject;
+ var valign:* = ValuesManager.valuesImpl.getValue(child, "vertical-align");
+ marginObject.valign = valign;
if (!hostSizedToContent)
{
// if host is sized by parent,
// we can position and size children horizontally now
- setPositionAndHeight(child, top, mt, padding.top, bottom, mb, padding.bottom, h);
+ setPositionAndHeight(child, top, mt, padding.top, bottom, mb, padding.bottom, h, valign);
maxHeight = Math.max(maxHeight, mt + child.height + mb);
}
else
@@ -167,8 +169,6 @@ package org.apache.flex.html.beads.layouts
maxHeight = Math.max(maxHeight, mt + child.height + mb);
}
xx = child.x + child.width;
- var valign:* = ValuesManager.valuesImpl.getValue(child, "vertical-align");
- marginObject.valign = valign;
}
if (hostSizedToContent)
{
@@ -181,39 +181,9 @@ package org.apache.flex.html.beads.layouts
if (child == null || !child.visible) continue;
var obj:Object = verticalMargins[i];
setPositionAndHeight(child, obj.top, obj.marginTop, padding.top,
- obj.bottom, obj.marginBottom, padding.bottom, maxHeight);
+ obj.bottom, obj.marginBottom, padding.bottom, maxHeight, obj.valign);
}
}
- for (i = 0; i < n; i++)
- {
- child = contentView.getElementAt(i) as IUIBase;
- ilc = child as ILayoutChild;
- if (child == null || !child.visible) continue;
- obj = verticalMargins[i];
- if (ilc)
- {
- if (!isNaN(ilc.percentHeight))
- ilc.setHeight(contentView.height * ilc.percentHeight / 100, !isNaN(ilc.percentHeight));
- }
- if (ilc)
- {
- if (obj.valign == "top")
- ilc.setY(obj.marginTop + padding.top);
- else if (valign == "bottom")
- ilc.setY(maxHeight - child.height - obj.marginBottom);
- else // TODO: aharui - baseline
- ilc.setY((maxHeight - child.height) / 2);
- }
- else
- {
- if (obj.valign == "top")
- child.y = obj.marginTop + padding.top;
- else if (valign == "bottom")
- child.y = maxHeight - child.height - obj.marginBottom;
- else // TODO: aharui - baseline
- child.y = (maxHeight - child.height) / 2;
- }
- }
// Only return true if the contentView needs to be larger; that new
// size is stored in the model.
@@ -225,53 +195,72 @@ package org.apache.flex.html.beads.layouts
}
private function setPositionAndHeight(child:IUIBase, top:Number, mt:Number, pt:Number,
- bottom:Number, mb:Number, pb:Number, h:Number):void
+ bottom:Number, mb:Number, pb:Number, h:Number,
+ valign:*):void
{
var heightSet:Boolean = false;
var hh:Number = h;
var ilc:ILayoutChild = child as ILayoutChild;
- if (!isNaN(top))
- {
- if (ilc)
- ilc.setY(top + mt);
- else
- child.y = top + mt;
- hh -= top + mt;
- }
- else
+ if (ilc)
{
- if (ilc)
- ilc.setY(mt + pt);
- else
- child.y = mt + pt;
- hh -= mt + pt;
+ if (!isNaN(ilc.percentHeight))
+ ilc.setHeight(h * ilc.percentHeight / 100, true);
}
- if (!isNaN(bottom))
+ if (valign == "top")
{
if (!isNaN(top))
{
if (ilc)
- ilc.setHeight(hh - bottom - mb, true);
- else
+ ilc.setY(top + mt);
+ else
+ child.y = top + mt;
+ hh -= top + mt;
+ }
+ else
+ {
+ if (ilc)
+ ilc.setY(mt + pt);
+ else
+ child.y = mt + pt;
+ hh -= mt + pt;
+ }
+ if (ilc.isHeightSizedToContent())
+ {
+ if (!isNaN(bottom))
{
- child.height = hh - bottom - mb;
- heightSet = true;
+ if (!isNaN(top))
+ {
+ if (ilc)
+ ilc.setHeight(hh - bottom - mb, true);
+ else
+ {
+ child.height = hh - bottom - mb;
+ heightSet = true;
+ }
+ }
}
}
- else
+ }
+ else if (valign == "bottom")
+ {
+ if (!isNaN(bottom))
{
if (ilc)
ilc.setY(h - bottom - mb - child.height);
else
child.y = h - bottom - mb - child.height;
}
+ else
+ {
+ if (ilc)
+ ilc.setY(h - mb - child.height);
+ else
+ child.y = h - mb - child.height;
+ }
}
- if (ilc)
- {
- if (!isNaN(ilc.percentHeight))
- ilc.setHeight(h * ilc.percentHeight / 100, true);
- }
+ else
+ child.y = (h - child.height) / 2;
if (!heightSet)
child.dispatchEvent(new Event("sizeChanged"));
}
[13/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
add 'Generated by...' to generated js files
Posted by ah...@apache.org.
add 'Generated by...' to generated js files
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1040589d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1040589d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1040589d
Branch: refs/heads/core_js_to_as
Commit: 1040589dec531f64e805077d8d5aa4c729ed9660
Parents: 0007212
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 23:45:42 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 23:45:53 2015 -0700
----------------------------------------------------------------------
build.properties | 20 ++++++++++++++++++++
build.xml | 15 ++++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1040589d/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index cd88f0a..ad5a887 100644
--- a/build.properties
+++ b/build.properties
@@ -73,3 +73,23 @@ manifest.Implementation-Title=Apache Flex SDK
manifest.Implementation-Version=${release.version}
manifest.Implementation-Vendor=The Apache Software Foundation
manifest.Implementation-Vendor-Id=org.apache
+
+generated.by.match=/\\*\\*. \\* Generated by Apache Flex Cross-Compiler
+generated.by.comment=/**\n\
+\ * Generated by Apache Flex Cross-Compiler
+
+asfheader=/**\n\
+\ * Licensed under the Apache License, Version 2.0 (the 'License');\n\
+\ * you may not use this file except in compliance with the License.\n\
+\ * You may obtain a copy of the License at\n\
+\ *\n\
+\ * http://www.apache.org/licenses/LICENSE-2.0\n\
+\ *\n\
+\ * Unless required by applicable law or agreed to in writing, software\n\
+\ * distributed under the License is distributed on an 'AS IS' BASIS,\n\
+\ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
+\ * See the License for the specific language governing permissions and\n\
+\ * limitations under the License.\n\
+\ */\n
+
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1040589d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index bf32096..c6b6c4a 100644
--- a/build.xml
+++ b/build.xml
@@ -785,7 +785,8 @@
<!-- If GOOG_HOME is set, copy GCL from there, else copy from the downloaded folder -->
<antcall target="copy-gcl-from-goog-home"/>
<antcall target="copy-gcl-from-downloaded"/>
-
+
+ <antcall target="inject-asf-header" />
<antcall target="binary-package-zip"/>
<antcall target="binary-package-tgz"/>
<copy todir="${basedir}/out" file="${basedir}/apache-flex-flexjs-installer-config.xml" />
@@ -1701,6 +1702,18 @@
<property name="base.folder.name" value="${basedir}/.." />
</target>
+ <!-- may not work on windows -->
+ <target name="inject-asf-header" >
+ <replaceregexp match="${generated.by.match}"
+ replace="${asfheader}${generated.by.comment}"
+ byline="false"
+ flags="s">
+ <fileset dir="${basedir}/temp">
+ <include name="**/*.js" />
+ </fileset>
+ </replaceregexp>
+ </target>
+
<target name="last-message-if-airsdk" if="airsdk.found" >
<echo>Please change directory to ${base.folder.name}/flex-asjs and run ant to complete build</echo>
</target>
[35/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
- Added the packaging of the config xml files in the framework directroy as a
"org.apache.flex.flexjs.framework:framework" artifact.
Posted by ah...@apache.org.
- Added the packaging of the config xml files in the framework directroy as a "org.apache.flex.flexjs.framework:framework" artifact.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/58c24a20
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/58c24a20
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/58c24a20
Branch: refs/heads/core_js_to_as
Commit: 58c24a201650b48c537461bdffcb80fc95934e70
Parents: 5c13f2b
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 22 19:45:39 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 22 19:45:39 2015 +0200
----------------------------------------------------------------------
maven.xml | 36 +++++++++++++++++++++++++++++++
maven/flexjs-framework-framework.pom | 11 ++++++++++
maven/flexjs-framework.pom | 6 ++++++
3 files changed, 53 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58c24a20/maven.xml
----------------------------------------------------------------------
diff --git a/maven.xml b/maven.xml
index 4f8d48a..c9818b5 100644
--- a/maven.xml
+++ b/maven.xml
@@ -144,6 +144,19 @@
<param name="fileName" value="frameworks/libs/Network.swc"/>
</antcall>
+ <!-- Zip up the config-xmls -->
+ <copy file="maven/flexjs-framework-framework.pom" tofile="generated/maven/flexjs-framework-framework.pom">
+ <filterchain>
+ <tokenfilter>
+ <replacestring from="@VERSION@" to="${maven.version}"/>
+ </tokenfilter>
+ </filterchain>
+ </copy>
+ <zip destfile="generated/maven/flexjs-framework-framework-configs.zip">
+ <fileset dir="frameworks" includes="*.xml"/>
+ <fileset dir="frameworks" includes="projects/*/*-manifest.xml"/>
+ </zip>
+
<copy file="maven/flexjs-framework.pom" tofile="generated/maven/flexjs-framework.pom">
<filterchain>
<tokenfilter>
@@ -244,6 +257,8 @@
<param name="artifactExtension" value="swc"/>
</antcall>
+ <antcall target="-install-maven-framework-config-artifact"/>
+
<antcall target="-install-maven-artifact-pom">
<param name="artifactName" value="flexjs-framework"/>
</antcall>
@@ -316,6 +331,8 @@
<param name="artifactName" value="network"/>
</antcall>
+ <antcall target="-deploy-maven-framework-config-artifact"/>
+
<antcall target="-deploy-maven-artifact-pom">
<param name="artifactName" value="flexjs-framework"/>
</antcall>
@@ -393,6 +410,15 @@
</artifact:install>
</target>
+ <target name="-install-maven-framework-config-artifact" depends="-setup-aether-antlib"
+ xmlns:artifact="antlib:org.eclipse.aether.ant">
+ <echo message="Installing Framework config"/>
+ <artifact:install>
+ <artifact:pom file="generated/maven/flexjs-framework-framework.pom"/>
+ <artifact:artifact file="generated/maven/flexjs-framework-framework-configs.zip" classifier="configs"/>
+ </artifact:install>
+ </target>
+
<target name="-install-maven-artifact-file-with-sources" depends="-setup-aether-antlib"
xmlns:artifact="antlib:org.eclipse.aether.ant">
<echo message="Installing File: ${artifactName}"/>
@@ -412,6 +438,16 @@
</artifact:deploy>
</target>
+ <target name="-deploy-maven-framework-config-artifact" depends="-setup-aether-antlib"
+ xmlns:artifact="antlib:org.eclipse.aether.ant">
+ <echo message="Deploying Framework config"/>
+ <artifact:install>
+ <artifact:remoterepo id="${maven.repositoryId}" url="${maven.repositoryUrl}"/>
+ <artifact:pom file="generated/maven/flexjs-framework-framework.pom"/>
+ <artifact:artifact file="generated/maven/flexjs-framework-framework-configs.zip" classifier="configs"/>
+ </artifact:install>
+ </target>
+
<target name="-deploy-maven-artifact-file" depends="-setup-aether-antlib"
xmlns:artifact="antlib:org.eclipse.aether.ant">
<echo message="Deploying File: ${artifactName} to ${maven.repositoryUrl}"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58c24a20/maven/flexjs-framework-framework.pom
----------------------------------------------------------------------
diff --git a/maven/flexjs-framework-framework.pom b/maven/flexjs-framework-framework.pom
new file mode 100644
index 0000000..163c4b3
--- /dev/null
+++ b/maven/flexjs-framework-framework.pom
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>@VERSION@</version>
+ <packaging>pom</packaging>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58c24a20/maven/flexjs-framework.pom
----------------------------------------------------------------------
diff --git a/maven/flexjs-framework.pom b/maven/flexjs-framework.pom
index 970e3e6..6466756 100644
--- a/maven/flexjs-framework.pom
+++ b/maven/flexjs-framework.pom
@@ -36,6 +36,12 @@
<dependencies>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>@VERSION@</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>binding</artifactId>
<version>@VERSION@</version>
<type>swc</type>
[29/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Remove angle property and its getter/setter. The rotation property should be
used to specify the gradient's rotation.
Posted by ah...@apache.org.
Remove angle property and its getter/setter. The rotation property should be used to specify the gradient's rotation.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/892fd753
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/892fd753
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/892fd753
Branch: refs/heads/core_js_to_as
Commit: 892fd753bdf2dec6a2ee62366cf4033da4e1132e
Parents: 031ad2e
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Sun Sep 20 01:42:42 2015 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Sun Sep 20 01:42:42 2015 -0700
----------------------------------------------------------------------
.../apache/flex/core/graphics/GradientBase.as | 31 --------------------
1 file changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/892fd753/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/GradientBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/GradientBase.as b/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/GradientBase.as
index 69d6ab8..ad23d5a 100644
--- a/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/GradientBase.as
+++ b/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/GradientBase.as
@@ -45,37 +45,6 @@ package org.apache.flex.core.graphics
public static const GRADIENT_DIMENSION:Number = 1638.4;
/**
- * Storage for the angle property.
- */
- private var _angle:Number;
-
- /**
- * By default, the LinearGradientStroke defines a transition
- * from left to right across the control.
- * Use the <code>angle</code> property to control the transition direction.
- * For example, a value of 180.0 causes the transition
- * to occur from right to left, rather than from left to right.
- *
- * @default 0.0
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- */
- public function get angle():Number
- {
- return _angle / Math.PI * 180;
- }
-
- /**
- * @private
- */
- public function set angle(value:Number):void
- {
- _angle = value / 180 * Math.PI;
- }
-
- /**
* Storage for the entries property.
*/
private var _entries:Array = [];
[43/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
don't need this fix (which didn't factor in padding anyway)
Posted by ah...@apache.org.
don't need this fix (which didn't factor in padding anyway)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b85f244b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b85f244b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b85f244b
Branch: refs/heads/core_js_to_as
Commit: b85f244b490a3ef3ba481dfd9c09f636cb62cded
Parents: 72c84c8
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 24 16:38:06 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 24 16:38:06 2015 -0700
----------------------------------------------------------------------
examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b85f244b/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml b/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
index 18a2b7a..951b1fa 100755
--- a/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
+++ b/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
@@ -138,7 +138,6 @@ limitations under the License.
for (var i:int = startIndex; i < n ; i++)
{
var item:ProductListItem = items[i];
- item.width = width;
var yTo:Number = i * (item.height);
//still need to prevent items that are already in motion from getting
//jumpy
[16/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
can't use getComputedStyle here because FF returns 0 instead of null or auto
Posted by ah...@apache.org.
can't use getComputedStyle here because FF returns 0 instead of null or auto
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/029ee8c1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/029ee8c1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/029ee8c1
Branch: refs/heads/core_js_to_as
Commit: 029ee8c1e17bbc9ebb42b0d5a0502085b4d98151
Parents: 9941802
Author: Alex Harui <ah...@apache.org>
Authored: Sun Sep 13 14:51:11 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Sep 13 14:51:11 2015 -0700
----------------------------------------------------------------------
.../Core/js/src/org/apache/flex/core/UIBase.js | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/029ee8c1/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
index 7cec9fd..ef667c9 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
@@ -804,12 +804,10 @@ org.apache.flex.core.UIBase.prototype.isWidthSizedToContent = function()
{
if (!isNaN(this.explicitWidth_) || !isNaN(this.percentWidth_))
return false;
-
- var scv = window.getComputedStyle(/** @type {Element} */ (this.positioner));
+ var left = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this, 'left');
+ var right = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this, 'right');
// not sized to content if both left and right are specified
- if (scv.left !== '' && scv.left != 'auto' && scv.right !== '' && scv.right != 'auto')
- return false;
- return true;
+ return (left === undefined || right === undefined);
};
@@ -821,11 +819,10 @@ org.apache.flex.core.UIBase.prototype.isHeightSizedToContent = function()
{
if (!isNaN(this.explicitHeight_) || !isNaN(this.percentHeight_))
return false;
- var scv = window.getComputedStyle(/** @type {Element} */ (this.positioner));
+ var top = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this, 'top');
+ var bottom = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this, 'bottom');
// not sized to content if both top and bottom are specified
- if (scv.top !== '' && scv.top != 'auto' && scv.bottom !== '' && scv.bottom != 'auto')
- return false;
- return true;
+ return (top === undefined || bottom === undefined);
};
[47/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Merge branch 'develop' into core_js_to_as
Posted by ah...@apache.org.
Merge branch 'develop' into core_js_to_as
Conflicts:
frameworks/projects/Core/as/src/CoreClasses.as
frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
frameworks/projects/Core/as/src/org/apache/flex/core/UIMetrics.as
frameworks/projects/Core/as/src/org/apache/flex/utils/BeadMetrics.as
frameworks/projects/Core/basic-manifest.xml
frameworks/projects/Core/compile-asjs-config.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/10ac8d8c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/10ac8d8c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/10ac8d8c
Branch: refs/heads/core_js_to_as
Commit: 10ac8d8cf934a05f003da90adb530118c1863aff
Parents: 14674b2 0bbba3e
Author: Alex Harui <ah...@apache.org>
Authored: Mon Sep 28 15:47:06 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Sep 28 15:47:06 2015 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 34 +-
LICENSE | 12 +-
LICENSE.bin | 19 +-
NOTICE | 5 +-
READme | 117 ++--
RELEASE_NOTES | 10 +
apache-flex-flexjs-installer-config.xml | 30 +-
build.properties | 24 +-
build.xml | 306 ++++++++++-
examples/ChartExample/build.xml | 48 --
examples/ChartExample/src/ChartExample.mxml | 37 --
examples/ChartExample/src/MyInitialView.mxml | 312 -----------
examples/ChartExample/src/README.txt | 31 --
examples/ChartExample/src/SpeedTestView.mxml | 187 -------
.../ChartExample/src/models/ProductsModel.as | 79 ---
examples/ChartExample/src/products/Product.as | 45 --
examples/ContainerTest/build.xml | 48 --
examples/ContainerTest/src/ContainerTest.mxml | 39 --
examples/ContainerTest/src/MyInitialView.mxml | 188 -------
.../ContainerTest/src/assets/logo_orange.png | Bin 33897 -> 0 bytes
.../ContainerTest/src/models/ProductsModel.as | 44 --
examples/ContainerTest/src/products/Product.as | 43 --
.../src/products/ProductItemRenderer.as | 83 ---
examples/ContainerTest/src/smallbluerect.jpg | Bin 13500 -> 0 bytes
examples/ContainerTest/src/smallgreenrect.jpg | Bin 13542 -> 0 bytes
examples/ContainerTest/src/smallorangerect.gif | Bin 821 -> 0 bytes
examples/ContainerTest/src/smallorangerect.jpg | Bin 13571 -> 0 bytes
examples/ContainerTest/src/smallpurplerect.jpg | Bin 13517 -> 0 bytes
examples/ContainerTest/src/smallredrect.jpg | Bin 13477 -> 0 bytes
examples/ContainerTest/src/smallyellowrect.jpg | Bin 13598 -> 0 bytes
.../CordovaCameraExample-app.xml | 252 ---------
examples/CordovaCameraExample/build.xml | 83 ---
.../src/CordovaCameraExample.mxml | 39 --
.../CordovaCameraExample/src/MyInitialView.mxml | 75 ---
examples/CordovaCameraExample/src/README.txt | 24 -
examples/DataBindingTest/build.xml | 47 --
.../DataBindingTest/src/DataBindingTest.mxml | 53 --
examples/DataBindingTest/src/MyInitialView.mxml | 144 -----
examples/DataBindingTest/src/README.txt | 52 --
.../src/StockDataJSONItemConverter.as | 40 --
.../src/controllers/MyController.as | 81 ---
examples/DataBindingTest/src/models/MyModel.as | 125 -----
examples/DataBindingTest_Flat/build.xml | 48 --
.../src/DataBindingTest.mxml | 53 --
.../DataBindingTest_Flat/src/MyInitialView.mxml | 144 -----
examples/DataBindingTest_Flat/src/README.txt | 52 --
.../src/StockDataJSONItemConverter.as | 40 --
.../src/controllers/MyController.as | 81 ---
.../DataBindingTest_Flat/src/models/MyModel.as | 125 -----
examples/DataBindingTest_as/build.xml | 47 --
.../DataBindingTest_as/src/DataBindingTest.as | 257 ---------
.../DataBindingTest_as/src/MyInitialView.as | 283 ----------
.../src/StockDataJSONItemConverter.as | 40 --
.../src/controllers/MyController.as | 81 ---
.../DataBindingTest_as/src/models/MyModel.as | 127 -----
examples/DataGridExample/build.xml | 45 --
.../DataGridExample/src/DataGridExample.mxml | 36 --
examples/DataGridExample/src/MyInitialView.mxml | 48 --
examples/DataGridExample/src/README.txt | 46 --
.../src/assets/smallbluerect.jpg | Bin 13500 -> 0 bytes
.../src/assets/smallgreenrect.jpg | Bin 13542 -> 0 bytes
.../src/assets/smallorangerect.gif | Bin 821 -> 0 bytes
.../src/assets/smallorangerect.jpg | Bin 13571 -> 0 bytes
.../src/assets/smallpurplerect.jpg | Bin 13517 -> 0 bytes
.../DataGridExample/src/assets/smallredrect.jpg | Bin 13477 -> 0 bytes
.../src/assets/smallyellowrect.jpg | Bin 13598 -> 0 bytes
.../DataGridExample/src/models/ProductsModel.as | 49 --
.../DataGridExample/src/products/Product.as | 43 --
.../src/products/ProductItemRenderer.as | 66 ---
examples/DataGridXcompile/build.xml | 45 --
.../DataGridXcompile/src/DataGridXcompile.mxml | 37 --
.../DataGridXcompile/src/MyInitialView.mxml | 83 ---
.../src/models/MyGridPresentation.as | 32 --
.../src/models/ProductsModel.as | 53 --
.../flex/core/IDataGridPresentationModel.as | 31 --
.../apache/flex/html/customControls/DataGrid.as | 60 --
.../customControls/beads/DataGridColumnView.as | 57 --
.../html/customControls/beads/DataGridView.as | 149 -----
.../DataItemRendererFactoryForColumnData.as | 101 ----
.../html/customControls/beads/IDataGridView.as | 27 -
.../beads/IDataProviderItemRendererMapper.as | 34 --
.../beads/models/DataGridPresentationModel.as | 65 ---
.../html/staticControls/beads/BoxGridView.as | 48 --
.../DataGridXcompile/src/products/Product.as | 41 --
examples/DateChooserExample/build.xml | 47 --
.../src/DateChooserExample.mxml | 36 --
.../DateChooserExample/src/MyInitialView.mxml | 44 --
examples/DateChooserExample/src/README.txt | 43 --
examples/DesktopMap/DesktopMap-app.xml | 252 ---------
examples/DesktopMap/README.txt | 41 --
examples/DesktopMap/build.xml | 77 ---
examples/DesktopMap/src/DesktopMap.mxml | 46 --
examples/DesktopMap/src/MyInitialView.mxml | 147 -----
examples/DesktopMap/src/models/MyModel.as | 56 --
examples/EffectsExample/build.xml | 51 --
examples/EffectsExample/src/EffectExample.mxml | 33 --
examples/EffectsExample/src/MyInitialView.mxml | 89 ---
examples/EffectsExample/src/README.txt | 35 --
examples/EffectsExample/src/jproctor.jpg | Bin 21684 -> 0 bytes
examples/EffectsExample/src/twong.jpg | Bin 19395 -> 0 bytes
examples/FlexJSStore/build.xml | 65 ---
examples/FlexJSStore/src/FlexJSStore.mxml | 268 ---------
examples/FlexJSStore/src/HomeView.mxml | 194 -------
.../FlexJSStore/src/ProductJSONItemConverter.as | 41 --
examples/FlexJSStore/src/ProductsView.mxml | 121 ----
examples/FlexJSStore/src/SupportView.mxml | 149 -----
examples/FlexJSStore/src/assets/akotter.jpg | Bin 19395 -> 0 bytes
examples/FlexJSStore/src/assets/bcrater.jpg | Bin 22670 -> 0 bytes
.../FlexJSStore/src/assets/beige_background.jpg | Bin 12533 -> 0 bytes
.../FlexJSStore/src/assets/beige_dotted_map.png | Bin 216598 -> 0 bytes
.../FlexJSStore/src/assets/blue_background.jpg | Bin 12868 -> 0 bytes
.../FlexJSStore/src/assets/blue_dotted_map.png | Bin 217088 -> 0 bytes
.../src/assets/button_cart_empty.png | Bin 289 -> 0 bytes
.../FlexJSStore/src/assets/button_cart_full.png | Bin 308 -> 0 bytes
.../FlexJSStore/src/assets/button_compare.png | Bin 304 -> 0 bytes
.../FlexJSStore/src/assets/button_details.png | Bin 284 -> 0 bytes
.../FlexJSStore/src/assets/button_tiles.png | Bin 218 -> 0 bytes
examples/FlexJSStore/src/assets/grip.png | Bin 19836 -> 0 bytes
.../FlexJSStore/src/assets/icon_cart_empty.png | Bin 29594 -> 0 bytes
.../FlexJSStore/src/assets/icon_compare.png | Bin 30218 -> 0 bytes
.../FlexJSStore/src/assets/icon_magnifier.png | Bin 30454 -> 0 bytes
examples/FlexJSStore/src/assets/icon_tiles.png | Bin 27988 -> 0 bytes
examples/FlexJSStore/src/assets/jproctor.jpg | Bin 21684 -> 0 bytes
examples/FlexJSStore/src/assets/logo_blue.png | Bin 33427 -> 0 bytes
examples/FlexJSStore/src/assets/logo_orange.png | Bin 33897 -> 0 bytes
.../FlexJSStore/src/assets/pic/abrilliam.jpg | Bin 18903 -> 0 bytes
examples/FlexJSStore/src/assets/pic/akotter.jpg | Bin 19395 -> 0 bytes
examples/FlexJSStore/src/assets/pic/bcrater.jpg | Bin 22670 -> 0 bytes
.../FlexJSStore/src/assets/pic/bleporte.jpg | Bin 23363 -> 0 bytes
.../FlexJSStore/src/assets/pic/bvanbrocklin.jpg | Bin 18066 -> 0 bytes
.../FlexJSStore/src/assets/pic/ccarpenter.jpg | Bin 19219 -> 0 bytes
.../FlexJSStore/src/assets/pic/clampberto.jpg | Bin 18611 -> 0 bytes
examples/FlexJSStore/src/assets/pic/davenon.jpg | Bin 20028 -> 0 bytes
.../FlexJSStore/src/assets/pic/dmcgoyal.jpg | Bin 19395 -> 0 bytes
.../FlexJSStore/src/assets/pic/dwillhelm.jpg | Bin 22670 -> 0 bytes
.../FlexJSStore/src/assets/pic/esunderland.jpg | Bin 23363 -> 0 bytes
.../FlexJSStore/src/assets/pic/jproctor.jpg | Bin 21684 -> 0 bytes
examples/FlexJSStore/src/assets/pic/mfields.jpg | Bin 18066 -> 0 bytes
.../FlexJSStore/src/assets/pic/pdempsey.jpg | Bin 18611 -> 0 bytes
examples/FlexJSStore/src/assets/pic/ptranep.jpg | Bin 19627 -> 0 bytes
.../FlexJSStore/src/assets/pic/rcrawley.jpg | Bin 23692 -> 0 bytes
.../FlexJSStore/src/assets/pic/rdreifus.jpg | Bin 20028 -> 0 bytes
examples/FlexJSStore/src/assets/pic/twong.jpg | Bin 19395 -> 0 bytes
examples/FlexJSStore/src/assets/support_map.png | Bin 172293 -> 0 bytes
.../src/assets/support_mapmarker_a.png | Bin 834 -> 0 bytes
.../src/assets/support_mapmarker_b.png | Bin 822 -> 0 bytes
.../src/assets/support_mapmarker_c.png | Bin 817 -> 0 bytes
.../src/assets/support_mapmarker_plus.png | Bin 827 -> 0 bytes
examples/FlexJSStore/src/assets/trashcan.png | Bin 182 -> 0 bytes
examples/FlexJSStore/src/beige.css | 171 ------
examples/FlexJSStore/src/blue.css | 165 ------
examples/FlexJSStore/src/data/catalog.json | 236 --------
examples/FlexJSStore/src/data/catalog.xml | 256 ---------
examples/FlexJSStore/src/main.css | 100 ----
.../src/productsView/CatalogTitleButtons.mxml | 70 ---
examples/FlexJSStore/src/productsView/Grip.mxml | 50 --
.../src/productsView/ProductCart.mxml | 117 ----
.../src/productsView/ProductCatalogPanel.mxml | 545 ------------------
.../ProductCatalogPanelTitleBarView.mxml | 49 --
.../productsView/ProductCatalogThumbnail.mxml | 220 --------
.../src/productsView/ProductDetails.mxml | 145 -----
.../src/productsView/ProductFilterPanel.mxml | 215 --------
.../src/productsView/ProductList.mxml | 219 --------
.../src/productsView/ProductListItem.mxml | 130 -----
.../src/productsView/ProductSupport.mxml | 90 ---
.../samples/flexstore/ButtonBarButtonSkin.as | 298 ----------
.../src/samples/flexstore/Product.as | 78 ---
.../src/samples/flexstore/ProductFilter.as | 56 --
.../src/samples/flexstore/ProductFilterEvent.as | 39 --
.../src/samples/flexstore/ProductListEvent.as | 42 --
.../src/samples/flexstore/ProductThumbEvent.as | 45 --
examples/FlexJSStore_jquery/build.xml | 65 ---
.../FlexJSStore_jquery/src/FlexJSStore.mxml | 269 ---------
examples/FlexJSStore_jquery/src/HomeView.mxml | 206 -------
.../src/ProductJSONItemConverter.as | 41 --
.../FlexJSStore_jquery/src/ProductsView.mxml | 125 -----
.../FlexJSStore_jquery/src/SupportView.mxml | 139 -----
.../FlexJSStore_jquery/src/assets/akotter.jpg | Bin 19395 -> 0 bytes
.../FlexJSStore_jquery/src/assets/bcrater.jpg | Bin 22670 -> 0 bytes
.../src/assets/beige_background.jpg | Bin 12533 -> 0 bytes
.../src/assets/beige_dotted_map.png | Bin 216598 -> 0 bytes
.../src/assets/blue_background.jpg | Bin 12868 -> 0 bytes
.../src/assets/blue_dotted_map.png | Bin 217088 -> 0 bytes
.../src/assets/button_cart_empty.png | Bin 289 -> 0 bytes
.../src/assets/button_cart_full.png | Bin 308 -> 0 bytes
.../src/assets/button_compare.png | Bin 304 -> 0 bytes
.../src/assets/button_details.png | Bin 284 -> 0 bytes
.../src/assets/button_tiles.png | Bin 218 -> 0 bytes
examples/FlexJSStore_jquery/src/assets/grip.png | Bin 19836 -> 0 bytes
.../src/assets/icon_cart_empty.png | Bin 29594 -> 0 bytes
.../src/assets/icon_compare.png | Bin 30218 -> 0 bytes
.../src/assets/icon_magnifier.png | Bin 30454 -> 0 bytes
.../src/assets/icon_tiles.png | Bin 27988 -> 0 bytes
.../FlexJSStore_jquery/src/assets/jproctor.jpg | Bin 21684 -> 0 bytes
.../FlexJSStore_jquery/src/assets/logo_blue.png | Bin 33427 -> 0 bytes
.../src/assets/logo_orange.png | Bin 33897 -> 0 bytes
.../src/assets/pic/abrilliam.jpg | Bin 18903 -> 0 bytes
.../src/assets/pic/akotter.jpg | Bin 19395 -> 0 bytes
.../src/assets/pic/bcrater.jpg | Bin 22670 -> 0 bytes
.../src/assets/pic/bleporte.jpg | Bin 23363 -> 0 bytes
.../src/assets/pic/bvanbrocklin.jpg | Bin 18066 -> 0 bytes
.../src/assets/pic/ccarpenter.jpg | Bin 19219 -> 0 bytes
.../src/assets/pic/clampberto.jpg | Bin 18611 -> 0 bytes
.../src/assets/pic/davenon.jpg | Bin 20028 -> 0 bytes
.../src/assets/pic/dmcgoyal.jpg | Bin 19395 -> 0 bytes
.../src/assets/pic/dwillhelm.jpg | Bin 22670 -> 0 bytes
.../src/assets/pic/esunderland.jpg | Bin 23363 -> 0 bytes
.../src/assets/pic/jproctor.jpg | Bin 21684 -> 0 bytes
.../src/assets/pic/mfields.jpg | Bin 18066 -> 0 bytes
.../src/assets/pic/pdempsey.jpg | Bin 18611 -> 0 bytes
.../src/assets/pic/ptranep.jpg | Bin 19627 -> 0 bytes
.../src/assets/pic/rcrawley.jpg | Bin 23692 -> 0 bytes
.../src/assets/pic/rdreifus.jpg | Bin 20028 -> 0 bytes
.../FlexJSStore_jquery/src/assets/pic/twong.jpg | Bin 19395 -> 0 bytes
.../src/assets/support_map.png | Bin 172293 -> 0 bytes
.../src/assets/support_mapmarker_a.png | Bin 834 -> 0 bytes
.../src/assets/support_mapmarker_b.png | Bin 822 -> 0 bytes
.../src/assets/support_mapmarker_c.png | Bin 817 -> 0 bytes
.../src/assets/support_mapmarker_plus.png | Bin 827 -> 0 bytes
.../FlexJSStore_jquery/src/assets/trashcan.png | Bin 182 -> 0 bytes
examples/FlexJSStore_jquery/src/beige.css | 171 ------
examples/FlexJSStore_jquery/src/blue.css | 165 ------
.../FlexJSStore_jquery/src/data/catalog.json | 236 --------
.../FlexJSStore_jquery/src/data/catalog.xml | 256 ---------
examples/FlexJSStore_jquery/src/main.css | 100 ----
.../src/productsView/CatalogTitleButtons.mxml | 69 ---
.../src/productsView/Grip.mxml | 49 --
.../src/productsView/ProductCart.mxml | 116 ----
.../src/productsView/ProductCatalogPanel.mxml | 547 -------------------
.../ProductCatalogPanelTitleBarView.mxml | 49 --
.../productsView/ProductCatalogThumbnail.mxml | 220 --------
.../src/productsView/ProductDetails.mxml | 150 -----
.../src/productsView/ProductFilterPanel.mxml | 215 --------
.../src/productsView/ProductList.mxml | 216 --------
.../src/productsView/ProductListItem.mxml | 130 -----
.../src/productsView/ProductSupport.mxml | 90 ---
.../samples/flexstore/ButtonBarButtonSkin.as | 298 ----------
.../src/samples/flexstore/Product.as | 78 ---
.../src/samples/flexstore/ProductFilter.as | 56 --
.../src/samples/flexstore/ProductFilterEvent.as | 39 --
.../src/samples/flexstore/ProductListEvent.as | 42 --
.../src/samples/flexstore/ProductThumbEvent.as | 45 --
examples/FlexJSTest_HTML5/build.xml | 44 --
.../FlexJSTest_HTML5/src/ButtonImageDown.png | Bin 206 -> 0 bytes
.../FlexJSTest_HTML5/src/ButtonImageOver.png | Bin 266 -> 0 bytes
examples/FlexJSTest_HTML5/src/ButtonImageUp.png | Bin 236 -> 0 bytes
.../FlexJSTest_HTML5/src/FlexJSTest_HTML5.mxml | 51 --
.../FlexJSTest_HTML5/src/MyInitialView.mxml | 144 -----
.../src/StockDataJSONItemConverter.as | 36 --
.../src/controllers/MyController.as | 92 ----
examples/FlexJSTest_HTML5/src/models/MyModel.as | 59 --
examples/FlexJSTest_Panel/build.xml | 45 --
.../FlexJSTest_Panel/src/FlexJSTest_Panel.mxml | 32 --
.../FlexJSTest_Panel/src/MyInitialView.mxml | 144 -----
examples/FlexJSTest_Panel/src/README.txt | 45 --
examples/FlexJSTest_SVG/build.xml | 45 --
examples/FlexJSTest_SVG/src/FlexJSTest_SVG.mxml | 39 --
examples/FlexJSTest_SVG/src/GraphicsView.mxml | 327 -----------
examples/FlexJSTest_SVG/src/MyInitialView.mxml | 58 --
examples/FlexJSTest_SVG/src/README.txt | 45 --
examples/FlexJSTest_SVG/src/SkinsView.mxml | 103 ----
.../src/controllers/MyController.as | 52 --
examples/FlexJSTest_SVG/src/models/MyModel.as | 47 --
.../FlexJSTest_SVG/src/skins/Button_up.mxml | 27 -
.../src/skins/flatspark/enums/BrandColorEnum.as | 30 -
.../skins/flatspark/enums/ButtonColorEnum.as | 59 --
.../src/skins/flatspark/enums/ButtonSizeEnum.as | 31 --
.../skins/flatspark/enums/ColorSwatchEnum.as | 40 --
.../src/skins/flatspark/enums/SizeEnum.as | 32 --
.../skins/flatspark/enums/TextInputSizeEnum.as | 30 -
.../src/skins/flatspark/utils/AwesomeUtils.as | 399 --------------
.../src/skins/flatspark/utils/ColorUtils.as | 89 ---
.../src/skins/flatspark/utils/ConfigSkin.as | 44 --
examples/FlexJSTest_basic/build.xml | 44 --
.../FlexJSTest_basic/src/ButtonImageDown.png | Bin 206 -> 0 bytes
.../FlexJSTest_basic/src/ButtonImageOver.png | Bin 266 -> 0 bytes
examples/FlexJSTest_basic/src/ButtonImageUp.png | Bin 236 -> 0 bytes
.../FlexJSTest_basic/src/FlexJSTest_basic.mxml | 51 --
.../FlexJSTest_basic/src/MyInitialView.mxml | 143 -----
examples/FlexJSTest_basic/src/README.txt | 47 --
.../src/StockDataJSONItemConverter.as | 38 --
.../src/controllers/MyController.as | 92 ----
examples/FlexJSTest_basic/src/models/MyModel.as | 59 --
examples/FlexJSTest_createjs/build.xml | 44 --
.../src/CreateJSExample.mxml | 58 --
.../FlexJSTest_createjs/src/MyInitialView.mxml | 58 --
examples/FlexJSTest_createjs/src/README.txt | 22 -
.../src/controllers/MyController.as | 57 --
.../FlexJSTest_createjs/src/models/MyModel.as | 53 --
examples/FlexJSTest_jquery/build.xml | 44 --
.../FlexJSTest_jquery/src/ButtonImageDown.png | Bin 206 -> 0 bytes
.../FlexJSTest_jquery/src/ButtonImageOver.png | Bin 266 -> 0 bytes
.../FlexJSTest_jquery/src/ButtonImageUp.png | Bin 236 -> 0 bytes
.../FlexJSTest_jquery/src/MyInitialView.mxml | 148 -----
.../src/StockDataJSONItemConverter.as | 38 --
.../src/controllers/MyController.as | 92 ----
.../FlexJSTest_jquery/src/jQuerySample.mxml | 64 ---
.../FlexJSTest_jquery/src/models/MyModel.as | 59 --
examples/FormExample/build.xml | 51 --
examples/FormExample/src/FormExample.mxml | 33 --
examples/FormExample/src/MyFormView.mxml | 73 ---
examples/FormExample/src/README.txt | 45 --
examples/FormatExample/build.xml | 51 --
examples/FormatExample/src/FormatExample.mxml | 33 --
examples/FormatExample/src/MyFormView.mxml | 133 -----
.../FormatExample/src/dialogs/DialogView.as | 38 --
.../FormatExample/src/dialogs/LoginDialog.mxml | 70 ---
.../accessories/NumberFormatter.as | 210 -------
.../accessories/PhoneNumberFormatter.as | 195 -------
examples/ImageTest/build.xml | 44 --
examples/ImageTest/src/ImageTest.mxml | 33 --
examples/ImageTest/src/MyInitialView.mxml | 45 --
examples/ImageTest/src/README.txt | 40 --
examples/ImageTest/src/largegreenrect.png | Bin 56681 -> 0 bytes
examples/ImageTest/src/smallbluerect.jpg | Bin 13500 -> 0 bytes
examples/ImageTest/src/smallgreenrect.jpg | Bin 13542 -> 0 bytes
examples/ImageTest/src/smallorangerect.gif | Bin 821 -> 0 bytes
examples/LanguageTests/build.xml | 45 --
examples/LanguageTests/src/LanguageTests.as | 141 -----
examples/LanguageTests/src/README.txt | 26 -
examples/LanguageTests/src/classes/B.as | 25 -
examples/LanguageTests/src/classes/C.as | 27 -
examples/LanguageTests/src/interfaces/IA.as | 22 -
examples/LanguageTests/src/interfaces/IB.as | 22 -
examples/LanguageTests/src/interfaces/IC.as | 22 -
examples/LanguageTests/src/interfaces/ID.as | 22 -
examples/LanguageTests/src/interfaces/IE.as | 22 -
examples/LanguageTests/src/interfaces/IF.as | 22 -
examples/ListsTest/build.xml | 45 --
examples/ListsTest/src/FirstView.mxml | 63 ---
examples/ListsTest/src/ListsTests.mxml | 36 --
examples/ListsTest/src/README.txt | 47 --
examples/ListsTest/src/models/ProductsModel.as | 42 --
examples/ListsTest/src/products/Product.as | 43 --
.../src/products/ProductItemRenderer.as | 83 ---
examples/ListsTest/src/smallbluerect.jpg | Bin 13500 -> 0 bytes
examples/ListsTest/src/smallgreenrect.jpg | Bin 13542 -> 0 bytes
examples/ListsTest/src/smallorangerect.gif | Bin 821 -> 0 bytes
examples/ListsTest/src/smallorangerect.jpg | Bin 13571 -> 0 bytes
examples/ListsTest/src/smallpurplerect.jpg | Bin 13517 -> 0 bytes
examples/ListsTest/src/smallredrect.jpg | Bin 13477 -> 0 bytes
examples/ListsTest/src/smallyellowrect.jpg | Bin 13598 -> 0 bytes
examples/MapSearch/MapSearch-app.xml | 252 ---------
examples/MapSearch/build.xml | 76 ---
examples/MapSearch/src/MapSearch.mxml | 46 --
examples/MapSearch/src/MyInitialView.mxml | 212 -------
examples/MapSearch/src/models/MyModel.as | 69 ---
examples/MobileTrader/build.xml | 44 --
examples/MobileTrader/src/MobileTrader.mxml | 39 --
examples/MobileTrader/src/MyInitialView.mxml | 255 ---------
.../src/StockDataJSONItemConverter.as | 40 --
.../MobileTrader/src/assets/arrow_left_24.png | Bin 47785 -> 0 bytes
examples/MobileTrader/src/assets/background.png | Bin 49376 -> 0 bytes
examples/MobileTrader/src/assets/logo.png | Bin 55223 -> 0 bytes
.../src/controller/AlertsViewController.as | 139 -----
.../src/controller/WatchListController.as | 137 -----
examples/MobileTrader/src/models/Alert.as | 94 ----
examples/MobileTrader/src/models/AssetsModel.as | 47 --
.../MobileTrader/src/models/ProductsModel.as | 160 ------
examples/MobileTrader/src/models/Stock.as | 148 -----
.../MobileTrader/src/renderers/AlertRenderer.as | 44 --
.../MobileTrader/src/renderers/StockRenderer.as | 47 --
examples/MobileTrader/src/views/AlertsView.mxml | 100 ----
examples/MobileTrader/src/views/AssetsView.mxml | 94 ----
examples/MobileTrader/src/views/SearchView.mxml | 37 --
examples/MobileTrader/src/views/StockView.mxml | 98 ----
.../MobileTrader/src/views/WatchListView.mxml | 150 -----
examples/RollEventsTest/build.xml | 44 --
examples/RollEventsTest/src/RollEvent.as | 15 -
.../RollEventsTest/src/RollEventController.as | 61 ---
examples/RollEventsTest/src/RollEventsTest.mxml | 52 --
examples/StatesTest/build.xml | 45 --
examples/StatesTest/src/MyInitialView.mxml | 164 ------
examples/StatesTest/src/README.txt | 47 --
examples/StatesTest/src/StatesTest.mxml | 52 --
.../src/StockDataJSONItemConverter.as | 40 --
.../StatesTest/src/controllers/MyController.as | 81 ---
examples/StatesTest/src/models/MyModel.as | 126 -----
examples/StockQuote/build.xml | 44 --
examples/StockQuote/src/MyInitialView.mxml | 169 ------
examples/StockQuote/src/README.txt | 49 --
.../src/StockDataJSONItemConverter.as | 40 --
examples/StockQuote/src/StockQuote.mxml | 52 --
.../StockQuote/src/controllers/MyController.as | 81 ---
examples/StockQuote/src/models/MyModel.as | 126 -----
examples/TodoListSampleApp/build.xml | 47 --
examples/TodoListSampleApp/src/README.txt | 22 -
.../src/TodoListSampleApp.mxml | 43 --
.../todo/controllers/TodoListController.as | 62 ---
.../src/sample/todo/events/TodoListEvent.as | 35 --
.../src/sample/todo/models/TodoListModel.as | 42 --
.../sample/todo/renderers/TodoItemRenderer.as | 69 ---
.../src/sample/todo/views/TodoListView.mxml | 109 ----
examples/VanillaSDK_POC/build.xml | 48 --
examples/VanillaSDK_POC/src/Example.as | 83 ---
examples/VanillaSDK_POC/src/Main.mxml | 21 -
examples/build.xml | 82 +--
examples/flexjs/ChartExample/build.xml | 74 +++
examples/flexjs/ChartExample/pom.xml | 50 ++
.../flexjs/ChartExample/src/ChartExample.mxml | 39 ++
.../flexjs/ChartExample/src/MyInitialView.mxml | 312 +++++++++++
examples/flexjs/ChartExample/src/README.txt | 31 ++
.../flexjs/ChartExample/src/SpeedTestView.mxml | 187 +++++++
.../ChartExample/src/models/ProductsModel.as | 79 +++
.../flexjs/ChartExample/src/products/Product.as | 45 ++
.../CordovaCameraExample-app.xml | 252 +++++++++
examples/flexjs/CordovaCameraExample/build.xml | 110 ++++
examples/flexjs/CordovaCameraExample/pom.xml | 50 ++
.../src/CordovaCameraExample.mxml | 39 ++
.../CordovaCameraExample/src/MyInitialView.mxml | 75 +++
.../flexjs/CordovaCameraExample/src/README.txt | 24 +
examples/flexjs/DataBindingExample/build.xml | 73 +++
examples/flexjs/DataBindingExample/pom.xml | 50 ++
.../src/DataBindingExample.mxml | 53 ++
.../DataBindingExample/src/MyInitialView.mxml | 144 +++++
.../flexjs/DataBindingExample/src/README.txt | 53 ++
.../src/StockDataJSONItemConverter.as | 40 ++
.../src/controllers/MyController.as | 81 +++
.../DataBindingExample/src/models/MyModel.as | 125 +++++
.../flexjs/DataBindingExample_Flat/build.xml | 74 +++
examples/flexjs/DataBindingExample_Flat/pom.xml | 50 ++
.../src/DataBindingExample.mxml | 53 ++
.../src/MyInitialView.mxml | 144 +++++
.../DataBindingExample_Flat/src/README.txt | 52 ++
.../src/StockDataJSONItemConverter.as | 40 ++
.../src/controllers/MyController.as | 81 +++
.../src/models/MyModel.as | 125 +++++
examples/flexjs/DataBindingExample_as/build.xml | 73 +++
examples/flexjs/DataBindingExample_as/pom.xml | 60 ++
.../src/DataBindingExample.as | 270 +++++++++
.../DataBindingExample_as/src/MyInitialView.as | 282 ++++++++++
.../src/StockDataJSONItemConverter.as | 40 ++
.../src/controllers/MyController.as | 81 +++
.../DataBindingExample_as/src/models/MyModel.as | 127 +++++
examples/flexjs/DataGridExample/build.xml | 71 +++
examples/flexjs/DataGridExample/pom.xml | 50 ++
.../DataGridExample/src/DataGridExample.mxml | 36 ++
.../DataGridExample/src/MyInitialView.mxml | 48 ++
examples/flexjs/DataGridExample/src/README.txt | 46 ++
.../src/assets/smallbluerect.jpg | Bin 0 -> 13500 bytes
.../src/assets/smallgreenrect.jpg | Bin 0 -> 13542 bytes
.../src/assets/smallorangerect.gif | Bin 0 -> 821 bytes
.../src/assets/smallorangerect.jpg | Bin 0 -> 13571 bytes
.../src/assets/smallpurplerect.jpg | Bin 0 -> 13517 bytes
.../DataGridExample/src/assets/smallredrect.jpg | Bin 0 -> 13477 bytes
.../src/assets/smallyellowrect.jpg | Bin 0 -> 13598 bytes
.../DataGridExample/src/models/ProductsModel.as | 49 ++
.../DataGridExample/src/products/Product.as | 43 ++
.../src/products/ProductItemRenderer.as | 66 +++
examples/flexjs/DesktopMap/DesktopMap-app.xml | 252 +++++++++
examples/flexjs/DesktopMap/README.txt | 41 ++
examples/flexjs/DesktopMap/build.xml | 104 ++++
examples/flexjs/DesktopMap/pom.xml | 50 ++
examples/flexjs/DesktopMap/src/DesktopMap.mxml | 46 ++
.../flexjs/DesktopMap/src/MyInitialView.mxml | 147 +++++
.../flexjs/DesktopMap/src/models/MyModel.as | 58 ++
examples/flexjs/FlexJSStore/build.xml | 91 +++
examples/flexjs/FlexJSStore/pom.xml | 50 ++
.../flexjs/FlexJSStore/src/FlexJSStore.mxml | 268 +++++++++
examples/flexjs/FlexJSStore/src/HomeView.mxml | 194 +++++++
.../FlexJSStore/src/ProductJSONItemConverter.as | 41 ++
.../flexjs/FlexJSStore/src/ProductsView.mxml | 121 ++++
.../flexjs/FlexJSStore/src/SupportView.mxml | 149 +++++
.../src/assets/427px-Bayarea_map.png | Bin 0 -> 122661 bytes
.../flexjs/FlexJSStore/src/assets/akotter.jpg | Bin 0 -> 19395 bytes
.../flexjs/FlexJSStore/src/assets/bcrater.jpg | Bin 0 -> 22670 bytes
.../FlexJSStore/src/assets/beige_background.jpg | Bin 0 -> 12533 bytes
.../FlexJSStore/src/assets/beige_dotted_map.png | Bin 0 -> 216598 bytes
.../FlexJSStore/src/assets/blue_background.jpg | Bin 0 -> 12868 bytes
.../FlexJSStore/src/assets/blue_dotted_map.png | Bin 0 -> 217088 bytes
.../src/assets/button_cart_empty.png | Bin 0 -> 289 bytes
.../FlexJSStore/src/assets/button_cart_full.png | Bin 0 -> 308 bytes
.../FlexJSStore/src/assets/button_compare.png | Bin 0 -> 304 bytes
.../FlexJSStore/src/assets/button_details.png | Bin 0 -> 284 bytes
.../FlexJSStore/src/assets/button_tiles.png | Bin 0 -> 218 bytes
examples/flexjs/FlexJSStore/src/assets/grip.png | Bin 0 -> 19836 bytes
.../FlexJSStore/src/assets/icon_cart_empty.png | Bin 0 -> 29594 bytes
.../FlexJSStore/src/assets/icon_compare.png | Bin 0 -> 30218 bytes
.../FlexJSStore/src/assets/icon_magnifier.png | Bin 0 -> 30454 bytes
.../FlexJSStore/src/assets/icon_tiles.png | Bin 0 -> 27988 bytes
.../flexjs/FlexJSStore/src/assets/jproctor.jpg | Bin 0 -> 21684 bytes
.../flexjs/FlexJSStore/src/assets/logo_blue.png | Bin 0 -> 33677 bytes
.../FlexJSStore/src/assets/logo_orange.png | Bin 0 -> 34166 bytes
.../FlexJSStore/src/assets/pic/abrilliam.jpg | Bin 0 -> 18903 bytes
.../FlexJSStore/src/assets/pic/akotter.jpg | Bin 0 -> 19395 bytes
.../FlexJSStore/src/assets/pic/bcrater.jpg | Bin 0 -> 22670 bytes
.../FlexJSStore/src/assets/pic/bleporte.jpg | Bin 0 -> 23363 bytes
.../FlexJSStore/src/assets/pic/bvanbrocklin.jpg | Bin 0 -> 18066 bytes
.../FlexJSStore/src/assets/pic/ccarpenter.jpg | Bin 0 -> 19219 bytes
.../FlexJSStore/src/assets/pic/clampberto.jpg | Bin 0 -> 18611 bytes
.../FlexJSStore/src/assets/pic/davenon.jpg | Bin 0 -> 20028 bytes
.../FlexJSStore/src/assets/pic/dmcgoyal.jpg | Bin 0 -> 19395 bytes
.../FlexJSStore/src/assets/pic/dwillhelm.jpg | Bin 0 -> 22670 bytes
.../FlexJSStore/src/assets/pic/esunderland.jpg | Bin 0 -> 23363 bytes
.../FlexJSStore/src/assets/pic/jproctor.jpg | Bin 0 -> 21684 bytes
.../FlexJSStore/src/assets/pic/mfields.jpg | Bin 0 -> 18066 bytes
.../FlexJSStore/src/assets/pic/pdempsey.jpg | Bin 0 -> 18611 bytes
.../FlexJSStore/src/assets/pic/ptranep.jpg | Bin 0 -> 19627 bytes
.../FlexJSStore/src/assets/pic/rcrawley.jpg | Bin 0 -> 23692 bytes
.../FlexJSStore/src/assets/pic/rdreifus.jpg | Bin 0 -> 20028 bytes
.../flexjs/FlexJSStore/src/assets/pic/twong.jpg | Bin 0 -> 19395 bytes
.../src/assets/support_mapmarker_a.png | Bin 0 -> 834 bytes
.../src/assets/support_mapmarker_b.png | Bin 0 -> 822 bytes
.../src/assets/support_mapmarker_c.png | Bin 0 -> 817 bytes
.../src/assets/support_mapmarker_plus.png | Bin 0 -> 827 bytes
.../flexjs/FlexJSStore/src/assets/trashcan.png | Bin 0 -> 182 bytes
examples/flexjs/FlexJSStore/src/beige.css | 171 ++++++
examples/flexjs/FlexJSStore/src/blue.css | 165 ++++++
.../flexjs/FlexJSStore/src/data/catalog.json | 236 ++++++++
.../flexjs/FlexJSStore/src/data/catalog.xml | 256 +++++++++
examples/flexjs/FlexJSStore/src/main.css | 100 ++++
.../src/productsView/CatalogTitleButtons.mxml | 70 +++
.../FlexJSStore/src/productsView/Grip.mxml | 48 ++
.../src/productsView/ProductCart.mxml | 117 ++++
.../src/productsView/ProductCatalogPanel.mxml | 546 ++++++++++++++++++
.../ProductCatalogPanelTitleBarView.mxml | 49 ++
.../productsView/ProductCatalogThumbnail.mxml | 220 ++++++++
.../src/productsView/ProductDetails.mxml | 145 +++++
.../src/productsView/ProductFilterPanel.mxml | 215 ++++++++
.../src/productsView/ProductList.mxml | 219 ++++++++
.../src/productsView/ProductListItem.mxml | 130 +++++
.../src/productsView/ProductSupport.mxml | 90 +++
.../samples/flexstore/ButtonBarButtonSkin.as | 298 ++++++++++
.../src/samples/flexstore/Product.as | 78 +++
.../src/samples/flexstore/ProductFilter.as | 56 ++
.../src/samples/flexstore/ProductFilterEvent.as | 39 ++
.../src/samples/flexstore/ProductListEvent.as | 42 ++
.../src/samples/flexstore/ProductThumbEvent.as | 45 ++
examples/flexjs/FlexJSStore_jquery/build.xml | 91 +++
examples/flexjs/FlexJSStore_jquery/pom.xml | 50 ++
.../FlexJSStore_jquery/src/FlexJSStore.mxml | 268 +++++++++
.../flexjs/FlexJSStore_jquery/src/HomeView.mxml | 195 +++++++
.../src/ProductJSONItemConverter.as | 41 ++
.../FlexJSStore_jquery/src/ProductsView.mxml | 121 ++++
.../FlexJSStore_jquery/src/SupportView.mxml | 149 +++++
.../src/assets/427px-Bayarea_map.png | Bin 0 -> 122661 bytes
.../FlexJSStore_jquery/src/assets/akotter.jpg | Bin 0 -> 19395 bytes
.../FlexJSStore_jquery/src/assets/bcrater.jpg | Bin 0 -> 22670 bytes
.../src/assets/beige_background.jpg | Bin 0 -> 12533 bytes
.../src/assets/beige_dotted_map.png | Bin 0 -> 216598 bytes
.../src/assets/blue_background.jpg | Bin 0 -> 12868 bytes
.../src/assets/blue_dotted_map.png | Bin 0 -> 217088 bytes
.../src/assets/button_cart_empty.png | Bin 0 -> 289 bytes
.../src/assets/button_cart_full.png | Bin 0 -> 308 bytes
.../src/assets/button_compare.png | Bin 0 -> 304 bytes
.../src/assets/button_details.png | Bin 0 -> 284 bytes
.../src/assets/button_tiles.png | Bin 0 -> 218 bytes
.../FlexJSStore_jquery/src/assets/grip.png | Bin 0 -> 19836 bytes
.../src/assets/icon_cart_empty.png | Bin 0 -> 29594 bytes
.../src/assets/icon_compare.png | Bin 0 -> 30218 bytes
.../src/assets/icon_magnifier.png | Bin 0 -> 30454 bytes
.../src/assets/icon_tiles.png | Bin 0 -> 27988 bytes
.../FlexJSStore_jquery/src/assets/jproctor.jpg | Bin 0 -> 21684 bytes
.../FlexJSStore_jquery/src/assets/logo_blue.png | Bin 0 -> 33677 bytes
.../src/assets/logo_orange.png | Bin 0 -> 34199 bytes
.../src/assets/pic/abrilliam.jpg | Bin 0 -> 18903 bytes
.../src/assets/pic/akotter.jpg | Bin 0 -> 19395 bytes
.../src/assets/pic/bcrater.jpg | Bin 0 -> 22670 bytes
.../src/assets/pic/bleporte.jpg | Bin 0 -> 23363 bytes
.../src/assets/pic/bvanbrocklin.jpg | Bin 0 -> 18066 bytes
.../src/assets/pic/ccarpenter.jpg | Bin 0 -> 19219 bytes
.../src/assets/pic/clampberto.jpg | Bin 0 -> 18611 bytes
.../src/assets/pic/davenon.jpg | Bin 0 -> 20028 bytes
.../src/assets/pic/dmcgoyal.jpg | Bin 0 -> 19395 bytes
.../src/assets/pic/dwillhelm.jpg | Bin 0 -> 22670 bytes
.../src/assets/pic/esunderland.jpg | Bin 0 -> 23363 bytes
.../src/assets/pic/jproctor.jpg | Bin 0 -> 21684 bytes
.../src/assets/pic/mfields.jpg | Bin 0 -> 18066 bytes
.../src/assets/pic/pdempsey.jpg | Bin 0 -> 18611 bytes
.../src/assets/pic/ptranep.jpg | Bin 0 -> 19627 bytes
.../src/assets/pic/rcrawley.jpg | Bin 0 -> 23692 bytes
.../src/assets/pic/rdreifus.jpg | Bin 0 -> 20028 bytes
.../FlexJSStore_jquery/src/assets/pic/twong.jpg | Bin 0 -> 19395 bytes
.../src/assets/support_mapmarker_a.png | Bin 0 -> 834 bytes
.../src/assets/support_mapmarker_b.png | Bin 0 -> 822 bytes
.../src/assets/support_mapmarker_c.png | Bin 0 -> 817 bytes
.../src/assets/support_mapmarker_plus.png | Bin 0 -> 827 bytes
.../FlexJSStore_jquery/src/assets/trashcan.png | Bin 0 -> 182 bytes
.../flexjs/FlexJSStore_jquery/src/beige.css | 171 ++++++
examples/flexjs/FlexJSStore_jquery/src/blue.css | 165 ++++++
.../FlexJSStore_jquery/src/data/catalog.json | 236 ++++++++
.../FlexJSStore_jquery/src/data/catalog.xml | 256 +++++++++
examples/flexjs/FlexJSStore_jquery/src/main.css | 100 ++++
.../src/productsView/CatalogTitleButtons.mxml | 70 +++
.../src/productsView/Grip.mxml | 48 ++
.../src/productsView/ProductCart.mxml | 117 ++++
.../src/productsView/ProductCatalogPanel.mxml | 546 ++++++++++++++++++
.../ProductCatalogPanelTitleBarView.mxml | 49 ++
.../productsView/ProductCatalogThumbnail.mxml | 220 ++++++++
.../src/productsView/ProductDetails.mxml | 145 +++++
.../src/productsView/ProductFilterPanel.mxml | 215 ++++++++
.../src/productsView/ProductList.mxml | 219 ++++++++
.../src/productsView/ProductListItem.mxml | 130 +++++
.../src/productsView/ProductSupport.mxml | 90 +++
.../samples/flexstore/ButtonBarButtonSkin.as | 298 ++++++++++
.../src/samples/flexstore/Product.as | 78 +++
.../src/samples/flexstore/ProductFilter.as | 56 ++
.../src/samples/flexstore/ProductFilterEvent.as | 39 ++
.../src/samples/flexstore/ProductListEvent.as | 42 ++
.../src/samples/flexstore/ProductThumbEvent.as | 45 ++
.../flexjs/FlexWebsiteStatsViewer/build.xml | 74 +++
examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 50 ++
.../src/FlexWebsiteStatsViewer.mxml | 55 ++
.../FlexWebsiteStatsViewer/src/README.txt | 23 +
.../FlexWebsiteStatsViewer/src/StatsView.mxml | 83 +++
.../src/controllers/GAJSONInputParser.as | 38 ++
.../controllers/GAStatsDataJSONItemConverter.as | 41 ++
.../src/controllers/StatsController.as | 77 +++
.../src/models/StatsModel.as | 55 ++
examples/flexjs/MapSearch/MapSearch-app.xml | 252 +++++++++
examples/flexjs/MapSearch/build.xml | 103 ++++
examples/flexjs/MapSearch/pom.xml | 50 ++
examples/flexjs/MapSearch/src/MapSearch.mxml | 46 ++
.../flexjs/MapSearch/src/MyInitialView.mxml | 212 +++++++
examples/flexjs/MapSearch/src/models/MyModel.as | 71 +++
examples/flexjs/MobileTrader/build.xml | 70 +++
examples/flexjs/MobileTrader/pom.xml | 50 ++
.../flexjs/MobileTrader/src/MobileTrader.mxml | 39 ++
.../flexjs/MobileTrader/src/MyInitialView.mxml | 255 +++++++++
.../src/StockDataJSONItemConverter.as | 40 ++
.../MobileTrader/src/assets/arrow_left_24.png | Bin 0 -> 47785 bytes
.../MobileTrader/src/assets/background.png | Bin 0 -> 49376 bytes
.../flexjs/MobileTrader/src/assets/logo.png | Bin 0 -> 55223 bytes
.../src/controller/AlertsViewController.as | 139 +++++
.../src/controller/WatchListController.as | 137 +++++
.../flexjs/MobileTrader/src/models/Alert.as | 94 ++++
.../MobileTrader/src/models/AssetsModel.as | 47 ++
.../MobileTrader/src/models/ProductsModel.as | 160 ++++++
.../flexjs/MobileTrader/src/models/Stock.as | 148 +++++
.../MobileTrader/src/renderers/AlertRenderer.as | 44 ++
.../MobileTrader/src/renderers/StockRenderer.as | 47 ++
.../MobileTrader/src/views/AlertsView.mxml | 100 ++++
.../MobileTrader/src/views/AssetsView.mxml | 89 +++
.../MobileTrader/src/views/SearchView.mxml | 37 ++
.../MobileTrader/src/views/StockView.mxml | 98 ++++
.../MobileTrader/src/views/WatchListView.mxml | 150 +++++
examples/flexjs/TodoListSampleApp/build.xml | 73 +++
examples/flexjs/TodoListSampleApp/pom.xml | 50 ++
.../flexjs/TodoListSampleApp/src/README.txt | 22 +
.../src/TodoListSampleApp.mxml | 43 ++
.../todo/controllers/TodoListController.as | 62 +++
.../src/sample/todo/events/TodoListEvent.as | 35 ++
.../src/sample/todo/models/TodoListModel.as | 42 ++
.../sample/todo/renderers/TodoItemRenderer.as | 69 +++
.../src/sample/todo/views/TodoListView.mxml | 109 ++++
examples/flexjs/pom.xml | 218 ++++++++
examples/native/ButtonExample/build.xml | 118 ++++
.../native/ButtonExample/src/ButtonExample.as | 34 ++
examples/native/USStatesMap/build.xml | 118 ++++
examples/native/USStatesMap/src/MapCoords.as | 75 +++
examples/native/USStatesMap/src/USStatesMap.as | 140 +++++
frameworks/build.xml | 4 +-
frameworks/downloads.xml | 10 +-
.../org/apache/flex/binding/SimpleBinding.as | 6 +-
.../projects/Binding/compile-asjs-config.xml | 2 +-
.../org/apache/flex/binding/ConstantBinding.js | 14 +
.../org/apache/flex/binding/SimpleBinding.js | 7 +-
frameworks/projects/Charts/asjs/defaults.css | 12 +-
.../org/apache/flex/charts/beads/ChartView.as | 60 +-
.../charts/beads/layouts/ChartBaseLayout.as | 4 +-
.../layouts/LineChartCategoryVsLinearLayout.as | 15 +-
.../layouts/LineChartLinearVsLinearLayout.as | 13 +-
.../flex/charts/beads/layouts/PieChartLayout.as | 13 +-
.../beads/layouts/StackedBarChartLayout.as | 13 +-
.../beads/layouts/StackedColumnChartLayout.as | 13 +-
.../flex/charts/optimized/SVGBoxItemRenderer.as | 12 -
.../charts/supportClasses/BoxItemRenderer.as | 12 -
.../projects/Charts/compile-asjs-config.xml | 2 +-
.../charts/supportClasses/ChartAxisGroup.js | 1 +
.../charts/supportClasses/ChartDataGroup.js | 1 +
.../Collections/compile-asjs-config.xml | 2 +-
frameworks/projects/Core/as/src/CoreClasses.as | 158 +++---
.../as/src/org/apache/flex/core/Application.as | 23 +-
.../apache/flex/core/BrowserResizeListener.as | 110 ++++
.../src/org/apache/flex/core/BrowserScroller.as | 80 +++
.../src/org/apache/flex/core/ContainerBase.as | 197 ++++---
.../flex/core/ContainerBaseStrandChildren.as | 98 ++++
.../as/src/org/apache/flex/core/IContainer.as | 11 -
.../src/org/apache/flex/core/IContainerView.as | 33 ++
.../org/apache/flex/core/IContentViewHost.as | 35 ++
.../as/src/org/apache/flex/core/ILayoutHost.as | 45 ++
.../src/org/apache/flex/core/ILayoutParent.as | 57 --
.../as/src/org/apache/flex/core/IValuesImpl.as | 14 +
.../as/src/org/apache/flex/core/IViewport.as | 88 ++-
.../src/org/apache/flex/core/IViewportModel.as | 129 ++---
.../as/src/org/apache/flex/core/ListBase.as | 123 +++++
.../apache/flex/core/ListBaseStrandChildren.as | 99 ++++
.../org/apache/flex/core/SimpleApplication.as | 89 +++
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 27 +
.../org/apache/flex/core/SimpleValuesImpl.as | 15 +
.../Core/as/src/org/apache/flex/core/UIBase.as | 30 +-
.../as/src/org/apache/flex/core/UIButtonBase.as | 2 +-
.../as/src/org/apache/flex/core/UIMetrics.as | 128 -----
.../as/src/org/apache/flex/core/ViewBase.as | 2 -
.../Core/as/src/org/apache/flex/geom/Size.as | 41 ++
.../as/src/org/apache/flex/utils/BeadMetrics.as | 149 -----
.../org/apache/flex/utils/CSSContainerUtils.as | 194 +++++++
.../org/apache/flex/core/BindableCSSStyles.as | 29 +
.../src/org/apache/flex/core/SimpleCSSStyles.as | 29 +
frameworks/projects/Core/basic-manifest.xml | 2 +
.../projects/Core/compile-asjs-config.xml | 10 +
.../Core/js/src/flash/display/Sprite.js | 40 --
.../js/src/org/apache/flex/core/Application.js | 8 +-
.../apache/flex/core/BrowserResizeListener.js | 78 +++
.../src/org/apache/flex/core/BrowserScroller.js | 55 ++
.../src/org/apache/flex/core/BrowserWindow.js | 3 +-
.../src/org/apache/flex/core/ContainerBase.js | 195 ++++++-
.../flex/core/ContainerBaseStrandChildren.js | 112 ++++
.../org/apache/flex/core/HTMLElementWrapper.js | 4 +-
.../js/src/org/apache/flex/core/IContainer.js | 6 -
.../src/org/apache/flex/core/IContainerView.js | 44 ++
.../org/apache/flex/core/IContentViewHost.js | 52 ++
.../org/apache/flex/core/IItemRendererParent.js | 1 +
.../js/src/org/apache/flex/core/ILayoutHost.js | 46 ++
.../src/org/apache/flex/core/ILayoutParent.js | 59 --
.../apache/flex/core/IListPresentationModel.js | 1 +
.../Core/js/src/org/apache/flex/core/IParent.js | 9 +-
.../apache/flex/core/ISelectableItemRenderer.js | 1 +
.../js/src/org/apache/flex/core/IViewport.js | 9 -
.../src/org/apache/flex/core/IViewportModel.js | 68 +--
.../js/src/org/apache/flex/core/ListBase.js | 70 ++-
.../apache/flex/core/ListBaseStrandChildren.js | 112 ++++
.../org/apache/flex/core/SimpleApplication.js | 49 ++
.../org/apache/flex/core/SimpleCSSValuesImpl.js | 42 +-
.../Core/js/src/org/apache/flex/core/UIBase.js | 92 +++-
.../js/src/org/apache/flex/core/UIMetrics.js | 79 ---
.../js/src/org/apache/flex/core/ViewBase.js | 90 +--
.../src/org/apache/flex/events/ElementEvents.js | 5 +
.../org/apache/flex/events/EventDispatcher.js | 81 ++-
.../js/src/org/apache/flex/geom/Rectangle.js | 26 +
.../Core/js/src/org/apache/flex/geom/Size.js | 56 ++
.../js/src/org/apache/flex/svg/TextButton.js | 1 +
.../js/src/org/apache/flex/utils/BeadMetrics.js | 59 --
.../org/apache/flex/utils/CSSContainerUtils.js | 81 +++
.../js/src/org/apache/flex/utils/Language.js | 25 +-
.../apache/flex/utils/MXMLDataInterpreter.js | 8 +-
.../src/org/apache/flex/utils/MixinManager.js | 2 +
.../js/src/org/apache/flex/utils/PointUtils.js | 7 +-
.../Core/js/src/org/apache/flex/utils/Timer.js | 1 +
.../js/src/org/apache/flex/createjs/CheckBox.js | 1 +
.../js/src/org/apache/flex/createjs/Label.js | 1 +
.../src/org/apache/flex/createjs/TextButton.js | 1 +
.../src/org/apache/flex/createjs/core/UIBase.js | 1 +
.../projects/DragDrop/compile-asjs-config.xml | 4 +-
.../projects/Effects/compile-asjs-config.xml | 2 +-
frameworks/projects/Flat/as/defaults.css | 36 +-
.../apache/flex/flat/beads/DropDownListView.as | 10 +-
frameworks/projects/Flat/flat-manifest.xml | 2 +-
.../js/src/org/apache/flex/flat/CheckBox.js | 1 +
.../js/src/org/apache/flex/flat/DropDownList.js | 93 +++-
.../js/src/org/apache/flex/flat/RadioButton.js | 1 +
.../projects/Formatters/compile-asjs-config.xml | 2 +-
.../js/src/org/apache/flex/maps/google/Map.js | 13 +-
.../js/src/org/apache/flex/maps/google/Place.js | 13 +-
.../apache/flex/maps/google/beads/MapView.js | 2 +
.../apache/flex/maps/google/models/MapModel.js | 10 +-
.../apache/flex/core/graphics/GradientBase.as | 31 --
.../apache/flex/core/graphics/GraphicShape.js | 3 +-
.../flex/core/graphics/GraphicsContainer.js | 2 +-
.../src/org/apache/flex/core/graphics/Path.js | 2 +-
.../src/org/apache/flex/core/graphics/Rect.js | 2 +-
frameworks/projects/HTML/as/defaults.css | 41 +-
.../as/src/org/apache/flex/html/DropDownList.as | 18 +
.../HTML/as/src/org/apache/flex/html/List.as | 27 +-
.../src/org/apache/flex/html/NumericStepper.as | 3 +-
.../HTML/as/src/org/apache/flex/html/VRule.as | 49 ++
.../src/org/apache/flex/html/beads/AlertView.as | 6 +-
.../org/apache/flex/html/beads/ButtonBarView.as | 15 +-
.../org/apache/flex/html/beads/ContainerView.as | 312 ++++++-----
.../html/beads/ControlBarMeasurementBead.as | 6 +-
.../apache/flex/html/beads/DropDownListView.as | 8 +-
.../src/org/apache/flex/html/beads/ListView.as | 34 +-
.../flex/html/beads/NumericStepperView.as | 7 +-
.../src/org/apache/flex/html/beads/PanelView.as | 135 ++---
.../flex/html/beads/PanelWithControlBarView.as | 165 +++---
.../apache/flex/html/beads/SimpleAlertView.as | 6 +-
.../org/apache/flex/html/beads/TextInputView.as | 10 +-
.../flex/html/beads/TextInputWithBorderView.as | 6 +-
.../TextItemRendererFactoryForArrayData.as | 5 +-
.../src/org/apache/flex/html/beads/VRuleView.as | 87 +++
.../beads/controllers/DropDownListController.as | 12 +
.../flex/html/beads/layouts/BasicLayout.as | 8 +-
.../flex/html/beads/layouts/ButtonBarLayout.as | 18 +-
.../flex/html/beads/layouts/HScrollBarLayout.as | 6 +-
.../flex/html/beads/layouts/HorizontalLayout.as | 191 +++----
.../flex/html/beads/layouts/TileLayout.as | 4 +-
.../flex/html/beads/layouts/VScrollBarLayout.as | 6 +-
.../flex/html/beads/layouts/VerticalLayout.as | 93 ++--
.../html/beads/models/ArraySelectionModel.as | 8 +-
.../flex/html/beads/models/ViewportModel.as | 170 ++----
.../html/supportClasses/ContainerContentArea.as | 2 +-
.../html/supportClasses/ScrollingViewport.as | 407 ++++++--------
.../supportClasses/TextFieldItemRenderer.as | 8 +-
.../apache/flex/html/supportClasses/Viewport.as | 161 +++---
.../org/apache/flex/html/MXMLBeadViewBase.as | 4 +-
.../apache/flex/html/beads/TitleBarView.mxml | 2 +-
.../FlexibleFirstChildHorizontalLayout.as | 128 +----
.../layouts/OneFlexibleChildHorizontalLayout.as | 42 +-
.../layouts/OneFlexibleChildVerticalLayout.as | 35 +-
.../html/beads/layouts/VerticalColumnLayout.as | 37 +-
frameworks/projects/HTML/basic-manifest.xml | 4 +-
.../projects/HTML/compile-asjs-config.xml | 2 +-
.../HTML/js/src/org/apache/flex/html/Button.js | 1 +
.../js/src/org/apache/flex/html/ButtonBar.js | 4 +-
.../js/src/org/apache/flex/html/CheckBox.js | 1 +
.../js/src/org/apache/flex/html/ComboBox.js | 3 +-
.../js/src/org/apache/flex/html/Container.js | 32 +-
.../js/src/org/apache/flex/html/ControlBar.js | 1 +
.../js/src/org/apache/flex/html/DropDownList.js | 23 +-
.../HTML/js/src/org/apache/flex/html/HRule.js | 1 +
.../HTML/js/src/org/apache/flex/html/Image.js | 3 +
.../org/apache/flex/html/ImageAndTextButton.js | 1 +
.../HTML/js/src/org/apache/flex/html/Label.js | 2 +
.../HTML/js/src/org/apache/flex/html/List.js | 5 +-
.../src/org/apache/flex/html/NumericStepper.js | 18 +-
.../HTML/js/src/org/apache/flex/html/Panel.js | 47 +-
.../js/src/org/apache/flex/html/RadioButton.js | 1 +
.../js/src/org/apache/flex/html/SimpleList.js | 1 +
.../HTML/js/src/org/apache/flex/html/Slider.js | 1 +
.../HTML/js/src/org/apache/flex/html/Spinner.js | 1 +
.../js/src/org/apache/flex/html/TextArea.js | 1 +
.../js/src/org/apache/flex/html/TextInput.js | 1 +
.../HTML/js/src/org/apache/flex/html/VRule.js | 50 ++
.../org/apache/flex/html/beads/ButtonBarView.js | 14 +
.../org/apache/flex/html/beads/ContainerView.js | 330 ++++++++---
.../src/org/apache/flex/html/beads/ImageView.js | 54 ++
.../src/org/apache/flex/html/beads/ListView.js | 100 ++--
.../src/org/apache/flex/html/beads/PanelView.js | 96 +++-
.../flex/html/beads/ScrollingContainerView.js | 2 +-
.../TextItemRendererFactoryForArrayData.js | 33 +-
.../controllers/ItemRendererMouseController.js | 24 +-
.../ListSingleSelectionMouseController.js | 3 +-
.../flex/html/beads/layouts/BasicLayout.js | 33 +-
.../html/beads/layouts/BasicScrollingLayout.js | 94 ----
.../flex/html/beads/layouts/ButtonBarLayout.js | 14 +-
.../flex/html/beads/layouts/HorizontalLayout.js | 28 +-
.../flex/html/beads/layouts/TileLayout.js | 9 +-
.../flex/html/beads/layouts/VerticalLayout.js | 21 +-
.../beads/layouts/VerticalScrollingLayout.js | 59 --
.../html/beads/models/ArraySelectionModel.js | 2 +
.../flex/html/beads/models/ViewportModel.js | 68 +--
.../ButtonBarButtonItemRenderer.js | 1 +
.../html/supportClasses/ContainerContentArea.js | 20 +
.../flex/html/supportClasses/DataGroup.js | 4 +-
.../html/supportClasses/DataItemRenderer.js | 1 +
.../html/supportClasses/ScrollingViewport.js | 73 ++-
.../html/supportClasses/StringItemRenderer.js | 1 +
.../apache/flex/html/supportClasses/Viewport.js | 66 ++-
.../js/src/org/apache/flex/html5/CheckBox.js | 1 +
.../js/src/org/apache/flex/html5/ComboBox.js | 3 +-
.../js/src/org/apache/flex/html5/RadioButton.js | 1 +
.../js/src/org/apache/flex/html5/TextArea.js | 1 +
.../js/src/org/apache/flex/html5/TextButton.js | 1 +
.../js/src/org/apache/flex/html5/TextInput.js | 1 +
frameworks/projects/JQuery/as/defaults.css | 7 +
.../projects/JQuery/js/src/jquery_externals.js | 3 +-
.../js/src/org/apache/flex/jquery/CheckBox.js | 1 +
.../src/org/apache/flex/jquery/RadioButton.js | 1 +
.../js/src/org/apache/flex/jquery/TextButton.js | 1 +
.../org/apache/flex/jquery/ToggleTextButton.js | 1 +
.../src/org/apache/flex/mobile/ManagerBase.as | 24 +-
.../Mobile/asjs/src/MobileASJSClasses.as | 2 +
.../apache/flex/mobile/StackedViewManager.as | 150 +----
.../org/apache/flex/mobile/TabbedViewManager.as | 182 +-----
.../asjs/src/org/apache/flex/mobile/View.as | 18 +-
.../org/apache/flex/mobile/ViewManagerBase.as | 229 ++++++++
.../flex/mobile/beads/StackedViewManagerView.as | 143 ++---
.../flex/mobile/beads/TabbedViewManagerView.as | 145 ++---
.../apache/flex/mobile/beads/ViewManagerView.as | 165 ++++++
.../flex/mobile/models/ViewManagerModel.as | 6 +
.../projects/Mobile/compile-asjs-config.xml | 2 +-
.../src/org/apache/flex/mobile/ManagerBase.js | 3 +
installer.xml | 110 +---
js/bin/asjsc | 70 +++
js/bin/asjsc.bat | 29 +
js/bin/asjscompc | 70 +++
js/bin/asjscompc.bat | 29 +
js/bin/compcjsc | 70 ---
js/bin/compcjsc.bat | 29 -
js/bin/jsc | 70 ---
js/bin/jsc.bat | 29 -
manualtests/ContainerTest/build.xml | 74 +++
.../ContainerTest/src/ContainerTest.mxml | 39 ++
.../ContainerTest/src/MyInitialView.mxml | 188 +++++++
.../ContainerTest/src/assets/logo_orange.png | Bin 0 -> 33897 bytes
.../ContainerTest/src/models/ProductsModel.as | 44 ++
.../ContainerTest/src/products/Product.as | 43 ++
.../src/products/ProductItemRenderer.as | 83 +++
manualtests/ContainerTest/src/smallbluerect.jpg | Bin 0 -> 13500 bytes
.../ContainerTest/src/smallgreenrect.jpg | Bin 0 -> 13542 bytes
.../ContainerTest/src/smallorangerect.gif | Bin 0 -> 821 bytes
.../ContainerTest/src/smallorangerect.jpg | Bin 0 -> 13571 bytes
.../ContainerTest/src/smallpurplerect.jpg | Bin 0 -> 13517 bytes
manualtests/ContainerTest/src/smallredrect.jpg | Bin 0 -> 13477 bytes
.../ContainerTest/src/smallyellowrect.jpg | Bin 0 -> 13598 bytes
manualtests/DataGridXcompile/build.xml | 71 +++
.../DataGridXcompile/src/DataGridXcompile.mxml | 37 ++
.../DataGridXcompile/src/MyInitialView.mxml | 83 +++
.../src/models/MyGridPresentation.as | 32 ++
.../src/models/ProductsModel.as | 53 ++
.../flex/core/IDataGridPresentationModel.as | 31 ++
.../apache/flex/html/customControls/DataGrid.as | 60 ++
.../customControls/beads/DataGridColumnView.as | 57 ++
.../html/customControls/beads/DataGridView.as | 149 +++++
.../DataItemRendererFactoryForColumnData.as | 101 ++++
.../html/customControls/beads/IDataGridView.as | 27 +
.../beads/IDataProviderItemRendererMapper.as | 34 ++
.../beads/models/DataGridPresentationModel.as | 65 +++
.../html/staticControls/beads/BoxGridView.as | 48 ++
.../DataGridXcompile/src/products/Product.as | 41 ++
manualtests/DateChooserExample/build.xml | 73 +++
.../src/DateChooserExample.mxml | 36 ++
.../DateChooserExample/src/MyInitialView.mxml | 44 ++
manualtests/DateChooserExample/src/README.txt | 43 ++
manualtests/EffectsExample/build.xml | 77 +++
.../EffectsExample/src/EffectExample.mxml | 33 ++
.../EffectsExample/src/MyInitialView.mxml | 89 +++
manualtests/EffectsExample/src/README.txt | 35 ++
manualtests/EffectsExample/src/jproctor.jpg | Bin 0 -> 21684 bytes
manualtests/EffectsExample/src/twong.jpg | Bin 0 -> 19395 bytes
manualtests/FlexJSTest_HTML5/build.xml | 70 +++
.../FlexJSTest_HTML5/src/ButtonImageDown.png | Bin 0 -> 206 bytes
.../FlexJSTest_HTML5/src/ButtonImageOver.png | Bin 0 -> 266 bytes
.../FlexJSTest_HTML5/src/ButtonImageUp.png | Bin 0 -> 236 bytes
.../FlexJSTest_HTML5/src/FlexJSTest_HTML5.mxml | 51 ++
.../FlexJSTest_HTML5/src/MyInitialView.mxml | 144 +++++
.../src/StockDataJSONItemConverter.as | 36 ++
.../src/controllers/MyController.as | 92 ++++
.../FlexJSTest_HTML5/src/models/MyModel.as | 59 ++
manualtests/FlexJSTest_Panel/build.xml | 71 +++
.../FlexJSTest_Panel/src/FlexJSTest_Panel.mxml | 32 ++
.../FlexJSTest_Panel/src/MyInitialView.mxml | 144 +++++
manualtests/FlexJSTest_Panel/src/README.txt | 45 ++
manualtests/FlexJSTest_SVG/build.xml | 71 +++
.../FlexJSTest_SVG/src/FlexJSTest_SVG.mxml | 39 ++
.../FlexJSTest_SVG/src/GraphicsView.mxml | 327 +++++++++++
.../FlexJSTest_SVG/src/MyInitialView.mxml | 58 ++
manualtests/FlexJSTest_SVG/src/README.txt | 45 ++
manualtests/FlexJSTest_SVG/src/SkinsView.mxml | 103 ++++
.../src/controllers/MyController.as | 52 ++
.../FlexJSTest_SVG/src/models/MyModel.as | 47 ++
.../FlexJSTest_SVG/src/skins/Button_up.mxml | 27 +
.../src/skins/flatspark/enums/BrandColorEnum.as | 30 +
.../skins/flatspark/enums/ButtonColorEnum.as | 59 ++
.../src/skins/flatspark/enums/ButtonSizeEnum.as | 31 ++
.../skins/flatspark/enums/ColorSwatchEnum.as | 40 ++
.../src/skins/flatspark/enums/SizeEnum.as | 32 ++
.../skins/flatspark/enums/TextInputSizeEnum.as | 30 +
.../src/skins/flatspark/utils/AwesomeUtils.as | 399 ++++++++++++++
.../src/skins/flatspark/utils/ColorUtils.as | 89 +++
.../src/skins/flatspark/utils/ConfigSkin.as | 44 ++
manualtests/FlexJSTest_basic/build.xml | 70 +++
.../FlexJSTest_basic/src/ButtonImageDown.png | Bin 0 -> 206 bytes
.../FlexJSTest_basic/src/ButtonImageOver.png | Bin 0 -> 266 bytes
.../FlexJSTest_basic/src/ButtonImageUp.png | Bin 0 -> 236 bytes
.../FlexJSTest_basic/src/FlexJSTest_basic.mxml | 51 ++
.../FlexJSTest_basic/src/MyInitialView.mxml | 143 +++++
manualtests/FlexJSTest_basic/src/README.txt | 47 ++
.../src/StockDataJSONItemConverter.as | 38 ++
.../src/controllers/MyController.as | 92 ++++
.../FlexJSTest_basic/src/models/MyModel.as | 59 ++
manualtests/FlexJSTest_createjs/build.xml | 70 +++
.../src/CreateJSExample.mxml | 58 ++
.../FlexJSTest_createjs/src/MyInitialView.mxml | 58 ++
manualtests/FlexJSTest_createjs/src/README.txt | 22 +
.../src/controllers/MyController.as | 57 ++
.../FlexJSTest_createjs/src/models/MyModel.as | 53 ++
manualtests/FlexJSTest_jquery/build.xml | 70 +++
.../FlexJSTest_jquery/src/ButtonImageDown.png | Bin 0 -> 206 bytes
.../FlexJSTest_jquery/src/ButtonImageOver.png | Bin 0 -> 266 bytes
.../FlexJSTest_jquery/src/ButtonImageUp.png | Bin 0 -> 236 bytes
.../FlexJSTest_jquery/src/MyInitialView.mxml | 148 +++++
.../src/StockDataJSONItemConverter.as | 38 ++
.../src/controllers/MyController.as | 92 ++++
.../FlexJSTest_jquery/src/jQuerySample.mxml | 64 +++
.../FlexJSTest_jquery/src/models/MyModel.as | 59 ++
manualtests/FormExample/build.xml | 77 +++
manualtests/FormExample/src/FormExample.mxml | 33 ++
manualtests/FormExample/src/MyFormView.mxml | 73 +++
manualtests/FormExample/src/README.txt | 45 ++
manualtests/FormatExample/build.xml | 77 +++
.../FormatExample/src/FormatExample.mxml | 33 ++
manualtests/FormatExample/src/MyFormView.mxml | 133 +++++
.../FormatExample/src/dialogs/DialogView.as | 38 ++
.../FormatExample/src/dialogs/LoginDialog.mxml | 70 +++
.../accessories/NumberFormatter.as | 210 +++++++
.../accessories/PhoneNumberFormatter.as | 195 +++++++
manualtests/ImageTest/build.xml | 70 +++
manualtests/ImageTest/src/ImageTest.mxml | 33 ++
manualtests/ImageTest/src/MyInitialView.mxml | 45 ++
manualtests/ImageTest/src/README.txt | 40 ++
manualtests/ImageTest/src/largegreenrect.png | Bin 0 -> 56681 bytes
manualtests/ImageTest/src/smallbluerect.jpg | Bin 0 -> 13500 bytes
manualtests/ImageTest/src/smallgreenrect.jpg | Bin 0 -> 13542 bytes
manualtests/ImageTest/src/smallorangerect.gif | Bin 0 -> 821 bytes
manualtests/LanguageTests/build.xml | 71 +++
manualtests/LanguageTests/src/LanguageTests.as | 159 ++++++
manualtests/LanguageTests/src/README.txt | 26 +
manualtests/LanguageTests/src/classes/B.as | 25 +
manualtests/LanguageTests/src/classes/C.as | 27 +
manualtests/LanguageTests/src/interfaces/IA.as | 22 +
manualtests/LanguageTests/src/interfaces/IB.as | 22 +
manualtests/LanguageTests/src/interfaces/IC.as | 22 +
manualtests/LanguageTests/src/interfaces/ID.as | 22 +
manualtests/LanguageTests/src/interfaces/IE.as | 22 +
manualtests/LanguageTests/src/interfaces/IF.as | 22 +
manualtests/ListsTest/build.xml | 71 +++
manualtests/ListsTest/src/FirstView.mxml | 63 +++
manualtests/ListsTest/src/ListsTests.mxml | 36 ++
manualtests/ListsTest/src/README.txt | 47 ++
.../ListsTest/src/models/ProductsModel.as | 42 ++
manualtests/ListsTest/src/products/Product.as | 43 ++
.../src/products/ProductItemRenderer.as | 83 +++
manualtests/ListsTest/src/smallbluerect.jpg | Bin 0 -> 13500 bytes
manualtests/ListsTest/src/smallgreenrect.jpg | Bin 0 -> 13542 bytes
manualtests/ListsTest/src/smallorangerect.gif | Bin 0 -> 821 bytes
manualtests/ListsTest/src/smallorangerect.jpg | Bin 0 -> 13571 bytes
manualtests/ListsTest/src/smallpurplerect.jpg | Bin 0 -> 13517 bytes
manualtests/ListsTest/src/smallredrect.jpg | Bin 0 -> 13477 bytes
manualtests/ListsTest/src/smallyellowrect.jpg | Bin 0 -> 13598 bytes
manualtests/RollEventsTest/build.xml | 70 +++
manualtests/RollEventsTest/src/RollEvent.as | 33 ++
.../RollEventsTest/src/RollEventController.as | 79 +++
.../RollEventsTest/src/RollEventsTest.mxml | 52 ++
manualtests/VanillaSDK_POC/build.xml | 48 ++
manualtests/VanillaSDK_POC/src/Example.as | 83 +++
manualtests/VanillaSDK_POC/src/Main.mxml | 21 +
manualtests/build.xml | 121 ++++
manualtests/build_example.xml | 356 ++++++++++++
maven.xml | 53 +-
maven/flexjs-framework-framework.pom | 11 +
maven/flexjs-framework.pom | 12 +
nightly.properties | 4 +-
templates/swfobject/index.template.html | 2 +-
1034 files changed, 31694 insertions(+), 27537 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/CoreClasses.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/CoreClasses.as
index e92f799,66df6d0..ac24459
--- a/frameworks/projects/Core/as/src/CoreClasses.as
+++ b/frameworks/projects/Core/as/src/CoreClasses.as
@@@ -21,86 -22,90 +21,90 @@@ package
/**
* @private
* This class is used to link additional classes into rpc.swc
- * beyond those that are found by dependecy analysis starting
+ * beyond those that are found by dependency analysis starting
* from the classes specified in manifest.xml.
*/
- internal class CoreClasses {
- /**
- import org.apache.flex.core.BeadViewBase; BeadViewBase;
- import org.apache.flex.core.BrowserWindow; BrowserWindow;
- import org.apache.flex.core.CSSShape; CSSShape;
- import org.apache.flex.core.CSSSprite; CSSSprite;
- import org.apache.flex.core.CSSTextField; CSSTextField;
- import org.apache.flex.core.StyleableCSSTextField; StyleableCSSTextField;
- import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory;
- import org.apache.flex.core.FilledRectangle; FilledRectangle;
- import org.apache.flex.core.IAlertModel; IAlertModel;
- import org.apache.flex.core.IBead; IBead;
- import org.apache.flex.core.IBeadController; IBeadController;
- import org.apache.flex.core.IBeadLayout; IBeadLayout;
- import org.apache.flex.core.IBeadModel; IBeadModel;
- import org.apache.flex.core.IBeadView; IBeadView;
- import org.apache.flex.core.IBorderModel; IBorderModel;
- import org.apache.flex.core.IChild; IChild;
- import org.apache.flex.core.IChrome; IChrome;
- import org.apache.flex.core.IComboBoxModel; IComboBoxModel;
- import org.apache.flex.core.IContainer; IContainer;
- import org.apache.flex.core.IContentView; IContentView;
- import org.apache.flex.core.IDataProviderItemRendererMapper; IDataProviderItemRendererMapper;
- import org.apache.flex.core.IDocument; IDocument;
- import org.apache.flex.core.IFormatBead; IFormatBead;
- import org.apache.flex.core.IImageModel; IImageModel;
- import org.apache.flex.core.ILayoutChild; ILayoutChild;
- import org.apache.flex.core.ILayoutParent; ILayoutParent;
- import org.apache.flex.core.IPanelModel; IPanelModel;
- import org.apache.flex.core.IParent; IParent;
- import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
- import org.apache.flex.core.IPopUp; IPopUp;
- import org.apache.flex.core.IRollOverModel; IRollOverModel;
- import org.apache.flex.core.IScrollBarModel; IScrollBarModel;
- import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer;
- import org.apache.flex.core.ISelectionModel; ISelectionModel;
- import org.apache.flex.core.IStrand; IStrand;
- import org.apache.flex.core.IStrandWithModel; IStrandWithModel;
- import org.apache.flex.core.ITextModel; ITextModel;
- import org.apache.flex.core.ITitleBarModel; ITitleBarModel;
- import org.apache.flex.core.IToggleButtonModel; IToggleButtonModel;
- import org.apache.flex.core.IUIBase; IUIBase;
- import org.apache.flex.core.IValueToggleButtonModel; IValueToggleButtonModel;
- import org.apache.flex.core.IViewport; IViewport;
- import org.apache.flex.core.IViewportModel; IViewportModel;
- import org.apache.flex.core.IViewportScroller; IViewportScroller;
- import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
- import org.apache.flex.core.DataBindingBase; DataBindingBase;
- import org.apache.flex.core.UIBase; UIBase;
- import org.apache.flex.core.UIButtonBase; UIButtonBase;
- import org.apache.flex.events.CustomEvent; CustomEvent;
- import org.apache.flex.events.Event; Event;
- import org.apache.flex.events.EventDispatcher; EventDispatcher;
- import org.apache.flex.events.IEventDispatcher; IEventDispatcher;
- import org.apache.flex.events.MouseEvent; MouseEvent;
- import org.apache.flex.events.ValueEvent; ValueEvent;
- import org.apache.flex.events.utils.MouseUtils; MouseUtils;
- import org.apache.flex.geom.Point; Point;
- import org.apache.flex.geom.Rectangle; Rectangle;
- import org.apache.flex.utils.BinaryData; BinaryData;
- import org.apache.flex.utils.BeadMetrics; BeadMetrics;
- import org.apache.flex.utils.CSSBorderUtils; CSSBorderUtils;
- import org.apache.flex.utils.dbg.DOMPathUtil; DOMPathUtil;
- import org.apache.flex.utils.EffectTimer; EffectTimer;
- import org.apache.flex.utils.MixinManager; MixinManager;
- import org.apache.flex.utils.PNGEncoder; PNGEncoder;
- import org.apache.flex.utils.SolidBorderUtil; SolidBorderUtil;
- import org.apache.flex.utils.StringTrimmer; StringTrimmer;
- import org.apache.flex.utils.Timer; Timer;
- import org.apache.flex.utils.UIUtils; UIUtils;
-
- import org.apache.flex.core.ClassFactory; ClassFactory;
- import org.apache.flex.states.AddItems; AddItems;
- import org.apache.flex.states.SetEventHandler; SetEventHandler;
- import org.apache.flex.states.SetProperty; SetProperty;
- import org.apache.flex.states.State; State;
- **/
+ internal class CoreClasses
+ {
+ import org.apache.flex.core.BeadViewBase; BeadViewBase;
+ import org.apache.flex.core.BrowserWindow; BrowserWindow;
+ import org.apache.flex.core.CSSShape; CSSShape;
+ import org.apache.flex.core.CSSSprite; CSSSprite;
+ import org.apache.flex.core.CSSTextField; CSSTextField;
+ import org.apache.flex.core.StyleableCSSTextField; StyleableCSSTextField;
+ import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory;
+ import org.apache.flex.core.FilledRectangle; FilledRectangle;
+ import org.apache.flex.core.IAlertModel; IAlertModel;
+ import org.apache.flex.core.IBead; IBead;
+ import org.apache.flex.core.IBeadController; IBeadController;
+ import org.apache.flex.core.IBeadLayout; IBeadLayout;
+ import org.apache.flex.core.IBeadModel; IBeadModel;
+ import org.apache.flex.core.IBeadView; IBeadView;
+ import org.apache.flex.core.IBorderModel; IBorderModel;
+ import org.apache.flex.core.IChild; IChild;
+ import org.apache.flex.core.IChrome; IChrome;
+ import org.apache.flex.core.IComboBoxModel; IComboBoxModel;
+ import org.apache.flex.core.IContainer; IContainer;
+ import org.apache.flex.core.IContainerView; IContainerView;
+ import org.apache.flex.core.IContentView; IContentView;
+ import org.apache.flex.core.IContentViewHost; IContentViewHost;
+ import org.apache.flex.core.IDataProviderItemRendererMapper; IDataProviderItemRendererMapper;
+ import org.apache.flex.core.IDocument; IDocument;
+ import org.apache.flex.core.IFormatBead; IFormatBead;
+ import org.apache.flex.core.IImageModel; IImageModel;
+ import org.apache.flex.core.ILayoutChild; ILayoutChild;
+ import org.apache.flex.core.ILayoutHost; ILayoutHost;
+ import org.apache.flex.core.IPanelModel; IPanelModel;
+ import org.apache.flex.core.IParent; IParent;
+ import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
+ import org.apache.flex.core.IPopUp; IPopUp;
+ import org.apache.flex.core.IRollOverModel; IRollOverModel;
+ import org.apache.flex.core.IScrollBarModel; IScrollBarModel;
+ import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer;
+ import org.apache.flex.core.ISelectionModel; ISelectionModel;
+ import org.apache.flex.core.IStrand; IStrand;
+ import org.apache.flex.core.IStrandWithModel; IStrandWithModel;
+ import org.apache.flex.core.ITextModel; ITextModel;
+ import org.apache.flex.core.ITitleBarModel; ITitleBarModel;
+ import org.apache.flex.core.IToggleButtonModel; IToggleButtonModel;
+ import org.apache.flex.core.IUIBase; IUIBase;
+ import org.apache.flex.core.IValueToggleButtonModel; IValueToggleButtonModel;
+ import org.apache.flex.core.IViewport; IViewport;
+ import org.apache.flex.core.IViewportModel; IViewportModel;
+ import org.apache.flex.core.IViewportScroller; IViewportScroller;
+ import org.apache.flex.core.ListBase; ListBase;
+ import org.apache.flex.core.ListBaseStrandChildren; ListBaseStrandChildren;
+ import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
+ import org.apache.flex.core.SimpleApplication; SimpleApplication;
+ import org.apache.flex.core.DataBindingBase; DataBindingBase;
+ import org.apache.flex.core.UIBase; UIBase;
+ import org.apache.flex.core.UIButtonBase; UIButtonBase;
+ import org.apache.flex.events.CustomEvent; CustomEvent;
+ import org.apache.flex.events.Event; Event;
+ import org.apache.flex.events.EventDispatcher; EventDispatcher;
+ import org.apache.flex.events.IEventDispatcher; IEventDispatcher;
+ import org.apache.flex.events.MouseEvent; MouseEvent;
+ import org.apache.flex.events.ValueEvent; ValueEvent;
+ import org.apache.flex.events.utils.MouseUtils; MouseUtils;
+ import org.apache.flex.geom.Point; Point;
+ import org.apache.flex.geom.Rectangle; Rectangle;
+ import org.apache.flex.utils.BinaryData; BinaryData;
+ import org.apache.flex.utils.CSSBorderUtils; CSSBorderUtils;
+ import org.apache.flex.utils.CSSContainerUtils; CSSContainerUtils;
+ import org.apache.flex.utils.dbg.DOMPathUtil; DOMPathUtil;
+ import org.apache.flex.utils.EffectTimer; EffectTimer;
+ import org.apache.flex.utils.MixinManager; MixinManager;
+ import org.apache.flex.utils.PNGEncoder; PNGEncoder;
+ import org.apache.flex.utils.SolidBorderUtil; SolidBorderUtil;
+ import org.apache.flex.utils.StringTrimmer; StringTrimmer;
+ import org.apache.flex.utils.Timer; Timer;
+ import org.apache.flex.utils.UIUtils; UIUtils;
+
+ import org.apache.flex.core.ClassFactory; ClassFactory;
+ import org.apache.flex.states.AddItems; AddItems;
+ import org.apache.flex.states.SetEventHandler; SetEventHandler;
+ import org.apache.flex.states.SetProperty; SetProperty;
+ import org.apache.flex.states.State; State;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
index 4f43dfe,fbcf83b..54d01a7
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
@@@ -236,8 -238,10 +245,9 @@@ package org.apache.flex.cor
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public var initialView:Object;
+ [Bindable("__NoChangeEvent__")]
+ public var initialView:ViewBase;
- [Bindable("__NoChangeEvent__")]
/**
* The data model (for the initial view).
*
@@@ -246,8 -250,8 +256,9 @@@
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ [Bindable("__NoChangeEvent__")]
- public var model:Object;
+ COMPILE::AS3
+ public var model:IBead;
/**
* The controller. The controller typically watches
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
index c523575,a847b01..0bcaaa3
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
@@@ -74,8 -74,7 +74,8 @@@ package org.apache.flex.cor
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
- public class ContainerBase extends UIBase implements IMXMLDocument, IStatesObject, IContainer
+ public class ContainerBase extends UIBase implements IMXMLDocument, IStatesObject, IContainer, IContentViewHost
{
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/IContainer.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
index 0000000,3f36723..fc38f36
mode 000000,100644..100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutHost.as
@@@ -1,0 -1,44 +1,45 @@@
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+ // 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.core
+ {
+ /**
+ * The ILayoutHost interface is the basic interface for the
+ * container views that have an IBeadLayout. The layout implementation
+ * often needs to know certain things about other objects in
+ * the view.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
++ COMPILE::AS3
+ public interface ILayoutHost
+ {
+ /**
+ * The container that parents all of the content.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get contentView():IParentIUIBase;
+ }
+ }
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
index 58d8710,a8c1f1a..60dc367
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
@@@ -119,5 -119,19 +119,19 @@@ package org.apache.flex.cor
* @productversion FlexJS 0.0
*/
function parseStyles(value:String):Object;
+
+ /**
+ * Add a style rule like a class selector.
+ *
+ * @param ruleName The name of the rule like '.myClassSelector'.
+ * @param values Name/value pairs.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function addRule(ruleName:String, values:Object):void;
+
}
-}
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
index 831971f,b66b74d..9fd5b00
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewport.as
@@@ -1,63 -1,58 +1,61 @@@
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+ // 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.core
{
+ import org.apache.flex.geom.Size;
-
- /**
- * A Viewport is the area of a Container set aside for displaying
- * content and any scrolling controls.
- */
- public interface IViewport extends IBead
++
+ /**
+ * A Viewport is a window onto an area of content. A viewport is given space
+ * in which to operate by a View bead. Viewports can control their area which
+ * is specified by the IViewportModel, adding scrollbars or whatever scrolling
+ * mechanism they want.
+ */
+ COMPILE::AS3
- public interface IViewport extends IBead
++ public interface IViewport extends IBead
{
+ /**
+ * Get the actual parent of the container's content.
+ */
+ function get contentView():IUIBase;
+
/**
- * The IViewportModel the instance of the Viewport should use to determine
- * its location and the location/size of the content it is managing. The
- * model also contains the layout to use and the contentArea to manage.
+ * Sets the upper left position of the viewport
+ * @param x The left position.
+ * @param y The top position.
*/
- function get model():IViewportModel;
- function set model(value:IViewportModel):void;
+ function setPosition(x:Number, y:Number):void;
/**
- * Invoke this function to actually change the contentArea (specified in
- * the IViewportModel.
+ * Size the content area based on any visible scrolling controls and
+ * the given width and height. If width and/or height is NaN
+ * then that dimension is being sized to content.
*/
- function updateContentAreaSize():void;
+ function layoutViewportBeforeContentLayout(width:Number, height:Number):void;
- /**
- * Invoke this function when the host of the viewport has changed size.
- */
- function updateSize():void;
-
- /**
- * If a View determines that scrollers are needed, it can inform the
- * Viewport using one of these three methods.
- */
- function needsScrollers():void;
- function needsVerticalScroller():void;
- function needsHorizontalScroller():void;
-
- /**
- * Returns the vertical scroller being used, if any.
- */
- function get verticalScroller():IViewportScroller;
-
- /**
- * Returns the horizontal scroller being used, if any.
- */
- function get horizontalScroller():IViewportScroller;
-
- /**
- * Returns the effective width of the vertical scroller. This may
- * be the actual width of the scroller or it might be zero if the
- * scroller has no impact on the view.
- */
- function scrollerWidth():Number;
-
- /**
- * Returns the effective height of the horizontal scroller. This may
- * be the actual height of the scroller or it might be zero if the
- * scroller has no impact on the view.
- */
- function scrollerHeight():Number;
+ /**
+ * This method is invoked after layout is complete. If width and/or height is
+ * sized to content, the viewport should determine that size and set the
+ * content area size appropriately, and display any scrolling controls
+ * before returning the resulting size of the viewport (which means the
+ * area used up by both content area and scrolling controls).
+ */
+ function layoutViewportAfterContentLayout():Size;
+
}
-}
+}
[32/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Fixed a small, but critical, typo.
Posted by ah...@apache.org.
Fixed a small, but critical, typo.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a6eb3868
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a6eb3868
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a6eb3868
Branch: refs/heads/core_js_to_as
Commit: a6eb3868656af69e086ccf147c34414f4375150c
Parents: f760bb4
Author: Peter Ent <pe...@apache.org>
Authored: Mon Sep 21 11:25:22 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Sep 21 11:25:22 2015 -0400
----------------------------------------------------------------------
.../HTML/as/src/org/apache/flex/html/beads/ContainerView.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a6eb3868/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
index f71a4ef..69f0a05 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
@@ -180,7 +180,7 @@ package org.apache.flex.html.beads
*/
public function get numElements():int
{
- return contentView.numElements();
+ return contentView.numElements;
}
/**
[10/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
use change in label instead of change in data otherwise data change can
happen before label has new size
Posted by ah...@apache.org.
use change in label instead of change in data otherwise data change can happen before label has new size
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/00f22de6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/00f22de6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/00f22de6
Branch: refs/heads/core_js_to_as
Commit: 00f22de68ea5aa53d843721220f3a795963ec48b
Parents: e7c0235
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:11:29 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:18 2015 -0700
----------------------------------------------------------------------
.../HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/00f22de6/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
index 3cad1f6..cebd24b 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
@@ -44,7 +44,7 @@ limitations under the License.
</fx:Script>
<js:beads>
<js:MXMLBeadViewBaseDataBinding />
- <js:LayoutChangeNotifier watchedProperty="{ITitleBarModel(model).title}" />
+ <js:LayoutChangeNotifier watchedProperty="{titleLabel.text}" />
</js:beads>
<js:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
[18/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
dismiss popup if click outside it. A later commit will detect clicks in the
background areas not covered by controls
Posted by ah...@apache.org.
dismiss popup if click outside it. A later commit will detect clicks in the background areas not covered by controls
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6168c17d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6168c17d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6168c17d
Branch: refs/heads/core_js_to_as
Commit: 6168c17d18ee507774f4f14d0f0dbd45d2fde30f
Parents: f2b1086
Author: Alex Harui <ah...@apache.org>
Authored: Mon Sep 14 11:49:39 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Sep 14 11:49:39 2015 -0700
----------------------------------------------------------------------
.../html/beads/controllers/DropDownListController.as | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6168c17d/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
index 17a4b64..29f58e1 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
@@ -25,6 +25,7 @@ package org.apache.flex.html.beads.controllers
import org.apache.flex.core.IBeadController;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -89,6 +90,16 @@ package org.apache.flex.html.beads.controllers
DisplayObject(viewBead.popUp).x = pt.x;
DisplayObject(viewBead.popUp).y = pt.y;
IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
+ IUIBase(_strand).topMostEventDispatcher.addEventListener("click", dismissHandler);
+ }
+
+ private function dismissHandler(event:Event):void
+ {
+ if (event.target == _strand) return;
+
+ IUIBase(_strand).topMostEventDispatcher.removeEventListener("click", dismissHandler);
+ var viewBead:IDropDownListView = _strand.getBeadByType(IDropDownListView) as IDropDownListView;
+ viewBead.popUpVisible = false;
}
private function changeHandler(event:Event):void
[03/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
absorb errors
Posted by ah...@apache.org.
absorb errors
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8592a204
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8592a204
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8592a204
Branch: refs/heads/core_js_to_as
Commit: 8592a204b6aa85ff685b597931f83a76cd47b5c0
Parents: 2e43d44
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:08:07 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:16 2015 -0700
----------------------------------------------------------------------
.../Binding/js/src/org/apache/flex/binding/SimpleBinding.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8592a204/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js b/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
index cac627d..4846f06 100644
--- a/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
+++ b/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
@@ -51,8 +51,11 @@ org.apache.flex.binding.SimpleBinding.prototype.eventName = '';
* @export
*/
org.apache.flex.binding.SimpleBinding.prototype.changeHandler = function() {
- this.destination[this.destinationPropertyName] =
- this.source[this.sourcePropertyName];
+ try {
+ this.destination[this.destinationPropertyName] =
+ this.source[this.sourcePropertyName];
+ }
+ catch (e) {}
};
[15/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
use map coords from a public domain source
Posted by ah...@apache.org.
use map coords from a public domain source
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/99418023
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/99418023
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/99418023
Branch: refs/heads/core_js_to_as
Commit: 994180230a03cc4a85e33dcc9cbde751e3446982
Parents: 1040589
Author: Alex Harui <ah...@apache.org>
Authored: Fri Sep 11 12:05:47 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Sep 11 12:05:47 2015 -0700
----------------------------------------------------------------------
LICENSE | 6 +-
examples/native/USStatesMap/src/MapCoords.as | 100 +++++++++++-----------
2 files changed, 55 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/99418023/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 439f630..cc866fb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -214,7 +214,11 @@ Portions of frameworks/projects/Flat/as/defaults.css is based on
designmodo’s (http://designmodo.com/flat-free/) Flat UI which is
available under an MIT license.
-The map image examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
+The map image in examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
was placed into the Public Domain by its author. See:
https://commons.wikimedia.org/wiki/File:Bayarea_map.png
+The map coordinates in examples/native/USStatesMap/src/MapCoords.js
+were placed into the Public Domain by its author. See:
+https://en.wikipedia.org/wiki/File:USA_CIA_Map.svg#file
+
[50/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
ported enough to replace many handwritten js classes in Core and get
DataBindingExample to mostly work
Posted by ah...@apache.org.
ported enough to replace many handwritten js classes in Core and get DataBindingExample to mostly work
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/037c9124
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/037c9124
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/037c9124
Branch: refs/heads/core_js_to_as
Commit: 037c91245c2bcdf17b0cbc42205306fd7660dff4
Parents: 7fe382a
Author: Alex Harui <ah...@apache.org>
Authored: Thu Oct 8 11:51:56 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Oct 8 11:51:56 2015 -0700
----------------------------------------------------------------------
.../apache/flex/binding/ViewBaseDataBinding.js | 6 +-
.../as/src/org/apache/flex/core/Application.as | 51 ++-
.../src/org/apache/flex/core/ApplicationBase.as | 24 +-
.../as/src/org/apache/flex/core/BeadViewBase.as | 1 -
.../src/org/apache/flex/core/CSSFontFaceBead.as | 1 -
.../src/org/apache/flex/core/ContainerBase.as | 50 ++-
.../org/apache/flex/core/HTMLElementWrapper.as | 123 ++++-
.../src/org/apache/flex/core/IBeadController.as | 1 -
.../as/src/org/apache/flex/core/IBeadView.as | 1 -
.../Core/as/src/org/apache/flex/core/IChild.as | 18 +-
.../src/org/apache/flex/core/IFlexJSElement.as | 29 ++
.../as/src/org/apache/flex/core/ILayoutChild.as | 8 +-
.../org/apache/flex/core/IMeasurementBead.as | 1 -
.../src/org/apache/flex/core/IParentIUIBase.as | 1 -
.../as/src/org/apache/flex/core/IPopUpHost.as | 1 -
.../as/src/org/apache/flex/core/IStatesImpl.as | 1 -
.../src/org/apache/flex/core/IStatesObject.as | 1 -
.../org/apache/flex/core/IStrandWithModel.as | 3 +-
.../org/apache/flex/core/IStyleableObject.as | 1 -
.../Core/as/src/org/apache/flex/core/IUIBase.as | 17 +-
.../as/src/org/apache/flex/core/IValuesImpl.as | 16 +
.../src/org/apache/flex/core/IViewportModel.as | 2 +-
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 145 +++++-
.../Core/as/src/org/apache/flex/core/UIBase.as | 445 +++++++++++++++++--
.../as/src/org/apache/flex/core/UIButtonBase.as | 8 +-
.../as/src/org/apache/flex/core/ViewBase.as | 1 -
.../src/org/apache/flex/events/ElementEvents.as | 5 +
.../org/apache/flex/events/EventDispatcher.as | 26 +-
.../org/apache/flex/events/IEventDispatcher.as | 4 +-
.../org/apache/flex/events/ValueChangeEvent.as | 10 +-
.../as/src/org/apache/flex/events/ValueEvent.as | 12 +-
.../as/src/org/apache/flex/states/AddItems.as | 1 -
.../org/apache/flex/states/ItemAndDescriptor.as | 1 -
.../org/apache/flex/states/SetEventHandler.as | 1 -
.../src/org/apache/flex/states/SetProperty.as | 1 -
.../Core/as/src/org/apache/flex/states/State.as | 1 -
.../apache/flex/utils/MXMLDataInterpreter.as | 96 ++--
.../flex/utils/ViewSourceContextMenuOption.as | 1 -
.../asjs/src/org/apache/flex/utils/CSSUtils.as | 1 -
frameworks/projects/Core/basic-manifest.xml | 8 +-
frameworks/projects/Core/build.xml | 5 +-
frameworks/projects/Core/compile-config.xml | 2 +
frameworks/projects/Core/compile-js-config.xml | 6 +-
.../js/src/org/apache/flex/html/DropDownList.js | 1 -
.../org/apache/flex/html/beads/ContainerView.js | 3 +-
45 files changed, 955 insertions(+), 186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Binding/js/src/org/apache/flex/binding/ViewBaseDataBinding.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/js/src/org/apache/flex/binding/ViewBaseDataBinding.js b/frameworks/projects/Binding/js/src/org/apache/flex/binding/ViewBaseDataBinding.js
index 61cd04c..d41c23f 100644
--- a/frameworks/projects/Binding/js/src/org/apache/flex/binding/ViewBaseDataBinding.js
+++ b/frameworks/projects/Binding/js/src/org/apache/flex/binding/ViewBaseDataBinding.js
@@ -60,8 +60,8 @@ Object.defineProperties(org.apache.flex.binding.ViewBaseDataBinding.prototype, {
set: function(value) {
if (this.strand_ !== value) {
this.strand_ = value;
- this.strand_.addEventListener('initComplete',
- goog.bind(this.initCompleteHandler, this));
+ this.strand_.addEventListener('initBindings',
+ goog.bind(this.initBindingsHandler, this));
}
}
}
@@ -72,7 +72,7 @@ Object.defineProperties(org.apache.flex.binding.ViewBaseDataBinding.prototype, {
* @protected
* @param {Object} event The event.
*/
-org.apache.flex.binding.ViewBaseDataBinding.prototype.initCompleteHandler =
+org.apache.flex.binding.ViewBaseDataBinding.prototype.initBindingsHandler =
function(event) {
var prop;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
index 54d01a7..8dc2e0d 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
@@ -127,18 +127,6 @@ package org.apache.flex.core
}
}
- /**
- * The document property is used to provide
- * a property lookup context for non-display objects.
- * For Application, it points to itself.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public var document:Object = this;
-
COMPILE::AS3
private function initHandler(event:flash.events.Event):void
{
@@ -258,7 +246,35 @@ package org.apache.flex.core
*/
[Bindable("__NoChangeEvent__")]
COMPILE::AS3
- public var model:IBead;
+ public var model:Object;
+
+ COMPILE::JS
+ private var _model:Object;
+
+ /**
+ * The data model (for the initial view).
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Bindable("__NoChangeEvent__")]
+ COMPILE::JS
+ override public function get model():Object
+ {
+ return _model;
+ }
+
+ /**
+ * @private
+ */
+ [Bindable("__NoChangeEvent__")]
+ COMPILE::JS
+ override public function set model(value:Object):void
+ {
+ _model = value;
+ }
/**
* The controller. The controller typically watches
@@ -269,7 +285,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public var controller:IBead;
+ public var controller:Object;
/**
* An array of data that describes the MXML attributes
@@ -409,6 +425,7 @@ package org.apache.flex.core
}
COMPILE::JS {
this.element.appendChild(c.element);
+ c.addedToParent();
}
}
@@ -546,7 +563,7 @@ package org.apache.flex.core
/**
- * @export
+ * @flexjsignorecoercion org.apache.flex.core.IBead
*/
COMPILE::JS
public function start():void
@@ -559,8 +576,8 @@ package org.apache.flex.core
dispatchEvent('initialize');
- if (model) addBead(model);
- if (controller) addBead(controller);
+ if (model is IBead) addBead(model as IBead);
+ if (controller is IBead) addBead(controller as IBead);
initialView.applicationModel = model;
addElement(initialView);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/ApplicationBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ApplicationBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ApplicationBase.as
index df4c9a6..84ec60e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ApplicationBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ApplicationBase.as
@@ -35,7 +35,7 @@ package org.apache.flex.core
* @productversion FlexJS 0.0
*/
COMPILE::AS3
- public class ApplicationBase extends Sprite
+ public class ApplicationBase extends Sprite implements IFlexInfo
{
/**
* Constructor.
@@ -50,6 +50,28 @@ package org.apache.flex.core
super();
}
+ private var _info:Object;
+
+ /**
+ * An Object containing information generated
+ * by the compiler that is useful at startup time.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function info():Object
+ {
+ if (!_info)
+ {
+ var mainClassName:String = getQualifiedClassName(this);
+ var initClassName:String = "_" + mainClassName + "_FlexInit";
+ var c:Class = ApplicationDomain.currentDomain.getDefinition(initClassName) as Class;
+ _info = c.info();
+ }
+ return _info;
+ }
}
COMPILE::JS
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/BeadViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/BeadViewBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/BeadViewBase.as
index b51975e..a31af58 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/BeadViewBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/BeadViewBase.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class BeadViewBase extends EventDispatcher implements IBeadView
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/CSSFontFaceBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/CSSFontFaceBead.as b/frameworks/projects/Core/as/src/org/apache/flex/core/CSSFontFaceBead.as
index 27aeebb..a847300 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/CSSFontFaceBead.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/CSSFontFaceBead.as
@@ -40,7 +40,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class CSSFontFaceBead implements IBead
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
index 0bcaaa3..b483ba9 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
@@ -74,7 +74,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class ContainerBase extends UIBase implements IMXMLDocument, IStatesObject, IContainer, IContentViewHost
{
/**
@@ -103,6 +102,24 @@ package org.apache.flex.core
}
/**
+ * @copy org.apache.flex.core.IParent#getElementAt()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function getElementAt(index:int):Object
+ {
+ var contentView:IParent = view as IParent;
+ if (contentView != null) {
+ return contentView.getElementAt(index);
+ } else {
+ return super.getElementIndex(index);
+ }
+ }
+
+ /**
* @private
*/
override public function getElementIndex(c:Object):int
@@ -111,7 +128,7 @@ package org.apache.flex.core
if (contentView != null) {
return contentView.getElementIndex(c);
} else {
- return getChildIndex(c as DisplayObject);
+ return super.getElementIndex(c);
}
}
@@ -127,7 +144,7 @@ package org.apache.flex.core
this.dispatchEvent(new Event("childrenAdded"));
}
else {
- addChild(c as DisplayObject);
+ super.addElement(c);
}
}
@@ -143,7 +160,7 @@ package org.apache.flex.core
this.dispatchEvent(new Event("childrenAdded"));
}
else {
- addChildAt(c as DisplayObject, index);
+ super.addElementAt(c, index);
}
}
@@ -159,7 +176,7 @@ package org.apache.flex.core
this.dispatchEvent(new Event("childrenRemoved"));
}
else {
- removeChild(c as DisplayObject);
+ super.removeElement(c);
}
}
@@ -266,12 +283,27 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function get MXMLDescriptor():Array
{
return _mxmlDescriptor;
}
/**
+ * @copy org.apache.flex.core.Application#MXMLDescriptor
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ override public function get MXMLDescriptor():Array
+ {
+ return _mxmlDescriptor;
+ }
+
+ /**
* @private
*/
public function setMXMLDescriptor(document:Object, value:Array):void
@@ -321,6 +353,8 @@ package org.apache.flex.core
/**
* @private
+ * @flexjsignorecoercion Class
+ * @flexjsignorecoercion org.apache.flex.core.IBead
*/
public function set states(value:Array):void
{
@@ -329,7 +363,11 @@ package org.apache.flex.core
try{
if (getBeadByType(IStatesImpl) == null)
- addBead(new (ValuesManager.valuesImpl.getValue(this, "iStatesImpl")) as IBead);
+ {
+ var c:Class = ValuesManager.valuesImpl.getValue(this, "iStatesImpl") as Class;
+ var b:Object = new c();
+ addBead(b as IBead);
+ }
}
//TODO: Need to handle this case more gracefully
catch(e:Error)
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/HTMLElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Core/as/src/org/apache/flex/core/HTMLElementWrapper.as
index 9775e29..1a3c58f 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/HTMLElementWrapper.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/HTMLElementWrapper.as
@@ -1,29 +1,32 @@
package org.apache.flex.core
{
+ COMPILE::AS3
+ {
+ import flash.display.Sprite;
+ }
+
COMPILE::JS
{
+ import window.Event;
+ import org.apache.flex.events.Event;
import org.apache.flex.events.BrowserEvent;
+ import org.apache.flex.events.ElementEvents;
import org.apache.flex.events.EventDispatcher;
import goog.events;
import goog.events.EventTarget;
}
+ COMPILE::AS3
+ public class HTMLElementWrapper extends Sprite
+ {
+
+ }
+
COMPILE::JS
public class HTMLElementWrapper extends EventDispatcher implements IStrand
{
//--------------------------------------
- // Static Property
- //--------------------------------------
-
- static public var googFireListener:Function;
-
- /**
- * The properties that triggers the static initializer
- */
- static public var installedOverride:Boolean = installOverride();
-
- //--------------------------------------
// Static Function
//--------------------------------------
@@ -35,7 +38,7 @@ package org.apache.flex.core
static public function fireListenerOverride(listener:Object, eventObject:BrowserEvent):Boolean
{
var e:BrowserEvent = new BrowserEvent();
- e.wrappedEvent = eventObject.wrappedEvent;
+ e.wrappedEvent = eventObject;
return HTMLElementWrapper.googFireListener(listener, e);
}
@@ -49,12 +52,50 @@ package org.apache.flex.core
return true;
}
+ //--------------------------------------
+ // Static Property
+ //--------------------------------------
+
+ static public var googFireListener:Function;
+
+ /**
+ * The properties that triggers the static initializer.
+ * Note, in JS, this property has to be declared
+ * after the installOverride.
+ */
+ static public var installedOverride:Boolean = installOverride();
+
//--------------------------------------
// Property
//--------------------------------------
- public var element:WrappedHTMLElement;
- public var model:IBead;
+ private var _element:WrappedHTMLElement;
+
+ public function get element():WrappedHTMLElement
+ {
+ return _element;
+ }
+
+ public function set element(value:WrappedHTMLElement):void
+ {
+ _element = value;
+ }
+
+ private var _model:IBeadModel;
+
+ public function get model():Object
+ {
+ return IBeadModel(_model);
+ }
+
+ public function set model(value:Object):void
+ {
+ if (_model != value)
+ {
+ addBead(value as IBead);
+ dispatchEvent(new org.apache.flex.events.Event("modelChanged"));
+ }
+ }
protected var beads:Array;
protected var internalDisplay:String = 'inline';
@@ -82,7 +123,7 @@ package org.apache.flex.core
if (bead is IBeadModel)
{
- model = bead;
+ _model = bead as IBeadModel;
}
bead.strand = this;
@@ -96,6 +137,8 @@ package org.apache.flex.core
{
var bead:IBead, i:uint, n:uint;
+ if (!beads) return null;
+
n = beads.length;
for (i = 0; i < n; i++)
@@ -135,5 +178,55 @@ package org.apache.flex.core
return null;
}
+
+ override public function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void
+ {
+ var source:Object = getActualDispatcher_(type);
+ goog.events.listen(source, type, handler);
+ }
+
+ override public function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void
+ {
+ var source:Object = getActualDispatcher_(type);
+ goog.events.unlisten(source, type, handler);
+ }
+
+ private function getActualDispatcher_(type:String):Object
+ {
+ var source:Object = this;
+ if (ElementEvents.elementEvents[type]) {
+ // mouse and keyboard events also dispatch off the element.
+ source = this.element;
+ }
+ return source;
+ }
+
+ override public function hasEventListener(type:String):Boolean
+ {
+ var source:Object = this.getActualDispatcher_(type);
+
+ return goog.events.hasListener(source, type);
+ }
+
+ override public function dispatchEvent(e:Object):Boolean
+ {
+ var t:String;
+ if (typeof(e) === 'string') {
+ t = e as String;
+ if (e === 'change')
+ e = new window.Event(t);
+ }
+ else {
+ t = e.type;
+ if (ElementEvents.elementEvents[t]) {
+ e = new window.Event(t);
+ }
+ }
+ var source:Object = this.getActualDispatcher_(t);
+ if (source == this)
+ return super.dispatchEvent(e);
+
+ return source.dispatchEvent(e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadController.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadController.as
index 13c5cb3..6dbe0a1 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadController.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadController.as
@@ -30,7 +30,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IBeadController extends IBead
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadView.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadView.as
index 962e12d..215e911 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadView.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IBeadView.as
@@ -31,7 +31,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IBeadView extends IBead
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IChild.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IChild.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IChild.as
index d7d2864..6052094 100755
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IChild.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IChild.as
@@ -18,7 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
- import flash.display.DisplayObjectContainer;
+ COMPILE::AS3
+ {
+ import flash.display.DisplayObjectContainer;
+ }
/**
* The IChild interface is the basic interface for a
@@ -29,7 +32,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IChild
{
/**
@@ -40,6 +42,18 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
function get parent():DisplayObjectContainer;
+
+ /**
+ * The parent.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ function get parent():IUIBase;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IFlexJSElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IFlexJSElement.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IFlexJSElement.as
new file mode 100644
index 0000000..cfc670a
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IFlexJSElement.as
@@ -0,0 +1,29 @@
+package org.apache.flex.core
+{
+ COMPILE::AS3
+ {
+ public interface IFlexJSElement
+ {
+
+ }
+ }
+
+ COMPILE::JS
+ public interface IFlexJSElement
+ {
+
+ //--------------------------------------
+ // Property
+ //--------------------------------------
+
+ /**
+ * A pointer back to the instance that wrapped this element.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ //function get flexjs_wrapper():Object;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutChild.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutChild.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutChild.as
index 0997b6b..3b96bfc 100755
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutChild.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ILayoutChild.as
@@ -18,7 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
- import flash.display.DisplayObjectContainer;
+ COMPILE::AS3
+ {
+ import flash.display.DisplayObjectContainer;
+ }
/**
* The IChild interface is the basic interface for a
@@ -29,7 +32,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface ILayoutChild extends IChild, IUIBase
{
/**
@@ -116,6 +118,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
function setX(value:Number):void;
/**
@@ -128,6 +131,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
function setY(value:Number):void;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IMeasurementBead.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IMeasurementBead.as
index 42545a3..1722c2d 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IMeasurementBead.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IMeasurementBead.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IMeasurementBead extends IBead
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IParentIUIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IParentIUIBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IParentIUIBase.as
index ffd5db5..d7abba4 100755
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IParentIUIBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IParentIUIBase.as
@@ -27,7 +27,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IParentIUIBase extends IParent, IUIBase
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUpHost.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUpHost.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUpHost.as
index bbd8f40..65f1334 100755
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUpHost.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IPopUpHost.as
@@ -27,7 +27,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IPopUpHost extends IParent
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesImpl.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesImpl.as
index 5c06b2a..df5bdee 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesImpl.as
@@ -31,7 +31,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IStatesImpl extends IEventDispatcher, IBead
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesObject.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesObject.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesObject.as
index 6a359d7..2088e7b 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesObject.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IStatesObject.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IStatesObject extends IEventDispatcher
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IStrandWithModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IStrandWithModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IStrandWithModel.as
index 7c9e756..ca2fd3e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IStrandWithModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IStrandWithModel.as
@@ -34,7 +34,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IStrandWithModel extends IStrand
{
/**
@@ -45,7 +44,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- function get model():IBeadModel;
+ function get model():Object;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleableObject.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleableObject.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleableObject.as
index 1164005..ffa5999 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleableObject.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IStyleableObject.as
@@ -29,7 +29,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IStyleableObject extends IEventDispatcher
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IUIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IUIBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IUIBase.as
index d46f4a2..9f5e50d 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IUIBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IUIBase.as
@@ -28,7 +28,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public interface IUIBase extends IStrand, IEventDispatcher
{
/**
@@ -41,7 +40,21 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- function get element():Object;
+ COMPILE::AS3
+ function get element():IFlexJSElement;
+
+ /**
+ * Each IUIBase has an element that is actually added to
+ * the platform's display list DOM. It may not be the actual
+ * component itself.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ function get element():WrappedHTMLElement;
/**
* Called by parent components when the component is
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
index 60dc367..f50a4ba 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IValuesImpl.as
@@ -133,5 +133,21 @@ package org.apache.flex.core
*/
function addRule(ruleName:String, values:Object):void;
+ /**
+ * Applies a set of styles to an instance. This is used
+ * by implementations that wrap internal elements to
+ * propagate styles to the right internal elements.
+ *
+ * @param instance An instance to apply styles to.
+ * @param styles An Object map of styles to apply.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ function applyStyles(instance:IUIBase, styles:Object):void;
+
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
index 3cc7040..328e2eb 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
@@ -27,7 +27,7 @@ package org.apache.flex.core
* of the Viewport.
*/
COMPILE::AS3
- public interface IViewportModel extends IBeadModel
+ public interface IViewportModel extends IBead
{
/**
* Size of the borders.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
index 22645f8..d02a985 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
+ import flash.display.JointStyle;
import flash.system.ApplicationDomain;
import flash.utils.getDefinitionByName;
import flash.utils.getQualifiedClassName;
@@ -25,8 +26,8 @@ package org.apache.flex.core
import org.apache.flex.events.EventDispatcher;
import org.apache.flex.events.ValueChangeEvent;
- import org.apache.flex.events.ValueEvent;
- import org.apache.flex.utils.CSSUtils;
+ import org.apache.flex.events.ValueEvent;
+ import org.apache.flex.utils.CSSUtils;
/**
* The SimpleCSSValuesImpl class implements a minimal set of
@@ -42,7 +43,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class SimpleCSSValuesImpl extends EventDispatcher implements IValuesImpl
{
/**
@@ -70,6 +70,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function init(mainClass:Object):void
{
var styleClassName:String;
@@ -101,6 +102,46 @@ package org.apache.flex.core
i++;
}
}
+ COMPILE::JS
+ public function init(mainClass:Object):void
+ {
+ var cssData:Array = mainClass.cssData;
+ var values:Object = this.values;
+ if (values == null)
+ values = {};
+
+ if (cssData) {
+ var n:int = cssData.length;
+ var i:int = 0;
+ while (i < n)
+ {
+ var numMQ:int = cssData[i++];
+ if (numMQ > 0)
+ {
+ // skip MediaQuery tests for now
+ i += numMQ;
+ }
+ var numSel:int = cssData[i++];
+ var props:Object = {};
+ for (var j:int = 0; j < numSel; j++)
+ {
+ var selName:String = cssData[i++];
+ if (values[selName])
+ props = values[selName];
+ values[selName] = props;
+ }
+ var numProps:int = cssData[i++];
+ for (j = 0; j < numProps; j++)
+ {
+ var propName:String = cssData[i++];
+ var propValue:Object = cssData[i++];
+ props[propName] = propValue;
+ }
+ }
+ }
+
+ this.values = values;
+ }
/**
* Process the encoded CSS data into data structures. Usually not called
@@ -200,7 +241,7 @@ package org.apache.flex.core
values[finalName] = valuesObject;
else
{
- valuesFunction.prototype = o;
+ valuesFunction["prototype"] = o;
values[finalName] = new valuesFunction();
}
}
@@ -345,7 +386,14 @@ package org.apache.flex.core
}
}
- className = getQualifiedClassName(thisObject);
+ COMPILE::AS3
+ {
+ className = getQualifiedClassName(thisObject);
+ }
+ COMPILE::JS
+ {
+ className = thisObject.FLEXJS_CLASS_INFO.names[0].qName;
+ }
var thisInstance:Object = thisObject;
while (className != "Object")
{
@@ -372,8 +420,19 @@ package org.apache.flex.core
if (value !== undefined)
return value;
}
- className = getQualifiedSuperclassName(thisInstance);
- thisInstance = getDefinitionByName(className);
+ COMPILE::AS3
+ {
+ className = getQualifiedSuperclassName(thisInstance);
+ thisInstance = getDefinitionByName(className);
+ }
+ COMPILE::JS
+ {
+ thisInstance = thisInstance.constructor["superClass_"];
+ if (!thisInstance || !thisInstance.FLEXJS_CLASS_INFO)
+ break;
+
+ className = thisInstance.FLEXJS_CLASS_INFO.names[0].qName;
+ }
}
if (inheritingStyles[valueName] != null &&
@@ -589,7 +648,77 @@ package org.apache.flex.core
"fontStyle" : 1,
"textAlign" : 1
}
-
+
+ /**
+ * The styles that apply to each UI widget
+ */
+ COMPILE::JS
+ public static var perInstanceStyles:Object = {
+ 'backgroundColor': 1,
+ 'backgroundImage': 1,
+ 'color': 1,
+ 'fontFamily': 1,
+ 'fontWeight': 1,
+ 'fontSize': 1,
+ 'fontStyle': 1
+ }
+
+
+ /**
+ * The styles that use color format #RRGGBB
+ */
+ COMPILE::JS
+ public static var colorStyles:Object = {
+ 'backgroundColor': 1,
+ 'borderColor': 1,
+ 'color': 1
+ }
+
+
+ /**
+ * The properties that enumerate that we skip
+ */
+ COMPILE::JS
+ public static var skipStyles:Object = {
+ 'constructor': 1
+ }
+
+
+
+ /**
+ * @param thisObject The object to apply styles to;
+ * @param styles The styles.
+ */
+ COMPILE::JS
+ public function applyStyles(thisObject:IUIBase, styles:Object):void
+ {
+ var styleList:Object = perInstanceStyles;
+ var colorStyles:Object = colorStyles;
+ var skipStyles:Object = skipStyles;
+ var listObj:Object = styles;
+ if (styles.styleList)
+ listObj = styles.styleList;
+ for (var p:String in listObj)
+ {
+ //if (styleList[p])
+ if (skipStyles[p])
+ continue;
+ var value:* = styles[p];
+ if (value === undefined)
+ continue;
+ if (typeof(value) == 'number') {
+ if (colorStyles[p])
+ value = '#' + value.toString(16);
+ else
+ value = value.toString() + 'px';
+ }
+ else if (p == 'backgroundImage') {
+ if (p.indexOf('url') !== 0)
+ value = 'url(' + value + ')';
+ }
+ thisObject.element.style[p] = value;
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
index a0ff3fb..be8e5f2 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
@@ -19,12 +19,14 @@
package org.apache.flex.core
{
import flash.display.DisplayObject;
+ import flash.display.JointStyle;
import flash.display.Sprite;
import flash.display.Stage;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.events.MouseEvent;
+ import org.apache.flex.events.ValueChangeEvent;
import org.apache.flex.events.utils.MouseEventConverter;
/**
@@ -134,8 +136,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
- public class UIBase extends Sprite implements IStrandWithModel, IEventDispatcher, IParentIUIBase, IStyleableObject, ILayoutChild
+ public class UIBase extends HTMLElementWrapper implements IStrandWithModel, IEventDispatcher, IParentIUIBase, IStyleableObject, ILayoutChild, IFlexJSElement
{
/**
* Constructor.
@@ -149,7 +150,15 @@ package org.apache.flex.core
{
super();
- MouseEventConverter.setupInstanceConverters(this);
+ COMPILE::AS3
+ {
+ MouseEventConverter.setupInstanceConverters(this);
+ }
+
+ COMPILE::JS
+ {
+ createElement();
+ }
}
private var _explicitWidth:Number;
@@ -303,6 +312,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
override public function get width():Number
{
var w:Number = _width;
@@ -311,10 +321,33 @@ package org.apache.flex.core
}
return w;
}
+
+ /**
+ * @flexjsignorecoercion String
+ */
+ COMPILE::JS
+ public function get width():Number
+ {
+ var pixels:Number;
+ var strpixels:String = positioner.style.width as String;
+ if (strpixels !== null && strpixels.indexOf('%') != -1)
+ pixels = NaN;
+ else
+ pixels = parseFloat(strpixels);
+ if (isNaN(pixels)) {
+ pixels = positioner.offsetWidth;
+ if (pixels === 0 && positioner.scrollWidth !== 0) {
+ // invisible child elements cause offsetWidth to be 0.
+ pixels = positioner.scrollWidth;
+ }
+ }
+ return pixels;
+ }
/**
* @private
*/
+ COMPILE::AS3
override public function set width(value:Number):void
{
if (explicitWidth != value)
@@ -324,6 +357,20 @@ package org.apache.flex.core
setWidth(value);
}
+
+ /**
+ * @private
+ */
+ COMPILE::JS
+ public function set width(value:Number):void
+ {
+ if (explicitWidth != value)
+ {
+ explicitWidth = value;
+ }
+
+ setWidth(value);
+ }
/**
* Retrieve the low-level bounding box width.
@@ -334,6 +381,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function get $width():Number
{
return super.width;
@@ -354,6 +402,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
override public function get height():Number
{
var h:Number = _height;
@@ -362,10 +411,33 @@ package org.apache.flex.core
}
return h;
}
+
+ /**
+ * @flexjsignorecoercion String
+ */
+ COMPILE::JS
+ public function get height():Number
+ {
+ var pixels:Number;
+ var strpixels:String = positioner.style.height as String;
+ if (strpixels !== null && strpixels.indexOf('%') != -1)
+ pixels = NaN;
+ else
+ pixels = parseFloat(strpixels);
+ if (isNaN(pixels)) {
+ pixels = positioner.offsetHeight;
+ if (pixels === 0 && positioner.scrollHeight !== 0) {
+ // invisible child elements cause offsetHeight to be 0.
+ pixels = positioner.scrollHeight;
+ }
+ }
+ return pixels;
+ }
/**
* @private
*/
+ COMPILE::AS3
override public function set height(value:Number):void
{
if (explicitHeight != value)
@@ -377,6 +449,20 @@ package org.apache.flex.core
}
/**
+ * @private
+ */
+ COMPILE::JS
+ public function set height(value:Number):void
+ {
+ if (explicitHeight != value)
+ {
+ explicitHeight = value;
+ }
+
+ setHeight(value);
+ }
+
+ /**
* Retrieve the low-level bounding box height.
* Not implemented in JS.
*
@@ -385,6 +471,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function get $height():Number
{
return super.height;
@@ -403,6 +490,10 @@ package org.apache.flex.core
if (_height != value)
{
_height = value;
+ COMPILE::JS
+ {
+ this.positioner.style.height = value.toString() + 'px';
+ }
if (!noEvent)
dispatchEvent(new Event("heightChanged"));
}
@@ -421,6 +512,10 @@ package org.apache.flex.core
if (_width != value)
{
_width = value;
+ COMPILE::JS
+ {
+ this.positioner.style.width = value.toString() + 'px';
+ }
if (!noEvent)
dispatchEvent(new Event("widthChanged"));
}
@@ -439,13 +534,20 @@ package org.apache.flex.core
if (_width != newWidth)
{
_width = newWidth;
- if (_width == newWidth)
- if (!noEvent)
- dispatchEvent(new Event("widthChanged"));
+ COMPILE::JS
+ {
+ this.positioner.style.width = newWidth.toString() + 'px';
+ }
+ if (!noEvent)
+ dispatchEvent(new Event("widthChanged"));
}
if (_height != newHeight)
{
_height = newHeight;
+ COMPILE::JS
+ {
+ this.positioner.style.height = newHeight.toString() + 'px';
+ }
if (!noEvent)
dispatchEvent(new Event("heightChanged"));
}
@@ -496,6 +598,7 @@ package org.apache.flex.core
/**
* @private
*/
+ COMPILE::AS3
override public function set x(value:Number):void
{
super.x = _x = value;
@@ -505,6 +608,26 @@ package org.apache.flex.core
style.left = value;
}
+ COMPILE::JS
+ public function set x(value:Number):void
+ {
+ positioner.style.position = 'absolute';
+ positioner.style.left = value.toString() + 'px';
+ }
+
+ /**
+ * @flexjsignorecoercion String
+ */
+ COMPILE::JS
+ public function get x():Number
+ {
+ var strpixels:String = positioner.style.left as String;
+ var pixels:Number = parseFloat(strpixels);
+ if (isNaN(pixels))
+ pixels = positioner.offsetLeft;
+ return pixels;
+ }
+
/**
* @copy org.apache.flex.core.ILayoutChild#setX
*
@@ -513,6 +636,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function setX(value:Number):void
{
super.x = value;
@@ -523,6 +647,7 @@ package org.apache.flex.core
/**
* @private
*/
+ COMPILE::AS3
override public function set y(value:Number):void
{
super.y = _y = value;
@@ -532,6 +657,26 @@ package org.apache.flex.core
style.top = value;
}
+ COMPILE::JS
+ public function set y(value:Number):void
+ {
+ positioner.style.position = 'absolute';
+ positioner.style.top = value.toString() + 'px';
+ }
+
+ /**
+ * @flexjsignorecoercion String
+ */
+ COMPILE::JS
+ public function get y():Number
+ {
+ var strpixels:String = positioner.style.top as String;
+ var pixels:Number = parseFloat(strpixels);
+ if (isNaN(pixels))
+ pixels = positioner.offsetTop;
+ return pixels;
+ }
+
/**
* @copy org.apache.flex.core.ILayoutChild#setY
*
@@ -540,6 +685,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function setY(value:Number):void
{
super.y = value;
@@ -549,13 +695,62 @@ package org.apache.flex.core
* @private
*/
[Bindable("visibleChanged")]
+ COMPILE::AS3
override public function set visible(value:Boolean):void
{
super.visible = value;
dispatchEvent(new Event(value?"show":"hide"));
dispatchEvent(new Event("visibleChanged"));
- }
+ }
+
+ COMPILE::JS
+ private var lastDisplay_:String;
+
+ COMPILE::JS
+ public function get visible():Boolean
+ {
+ return positioner.style.display !== 'none';
+ }
+
+ COMPILE::JS
+ public function set visible(value:Boolean):void
+ {
+ var oldValue:Boolean = positioner.style.display !== 'none';
+ if (value !== oldValue)
+ {
+ if (!value)
+ {
+ lastDisplay_ = positioner.style.display;
+ positioner.style.display = 'none';
+ dispatchEvent(new Event('hide'));
+ }
+ else
+ {
+ if (lastDisplay_)
+ {
+ positioner.style.display = lastDisplay_;
+ } else
+ {
+ positioner.style.display = internalDisplay;
+ }
+ dispatchEvent(new Event('show'));
+ }
+ dispatchEvent(new Event('visibleChanged'));
+ }
+ }
+
+ /**
+ * @return The array of children.
+ * @flexjsignorecoercion Array
+ */
+ COMPILE::JS
+ public function internalChildren():Array
+ {
+ return element.childNodes as Array;
+ }
+
+ COMPILE::AS3
private var _model:IBeadModel;
/**
@@ -566,7 +761,8 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get model():IBeadModel
+ COMPILE::AS3
+ public function get model():Object
{
if (_model == null)
{
@@ -579,7 +775,8 @@ package org.apache.flex.core
/**
* @private
*/
- public function set model(value:IBeadModel):void
+ COMPILE::AS3
+ public function set model(value:Object):void
{
if (_model != value)
{
@@ -597,6 +794,7 @@ package org.apache.flex.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion Class
*/
public function get view():IBeadView
{
@@ -654,7 +852,7 @@ package org.apache.flex.core
}
}
- private var _styles:Object;
+ private var _style:Object;
/**
* The object that contains
@@ -670,26 +868,27 @@ package org.apache.flex.core
*/
public function get style():Object
{
- return _styles;
+ return _style;
}
/**
* @private
+ * @flexjsignorecoercion String
*/
public function set style(value:Object):void
{
- if (_styles != value)
+ if (_style != value)
{
if (value is String)
{
- _styles = ValuesManager.valuesImpl.parseStyles(value as String);
+ _style = ValuesManager.valuesImpl.parseStyles(value as String);
}
else
- _styles = value;
+ _style = value;
if (!isNaN(_y))
- _styles.top = _y;
+ _style.top = _y;
if (!isNaN(_x))
- _styles.left = _x;
+ _style.left = _x;
dispatchEvent(new Event("stylesChanged"));
}
}
@@ -728,6 +927,10 @@ package org.apache.flex.core
{
if (_className != value)
{
+ COMPILE::JS
+ {
+ element.className = typeNames ? value + ' ' + typeNames : value;
+ }
_className = value;
dispatchEvent(new Event("classNameChanged"));
}
@@ -741,7 +944,8 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get element():Object
+ COMPILE::AS3
+ public function get element():IFlexJSElement
{
return this;
}
@@ -754,8 +958,10 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public var beads:Array;
+ COMPILE::AS3
private var _beads:Vector.<IBead>;
/**
@@ -766,6 +972,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function addBead(bead:IBead):void
{
if (!_beads)
@@ -790,6 +997,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function getBeadByType(classOrInterface:Class):IBead
{
for each (var bead:IBead in _beads)
@@ -808,6 +1016,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ COMPILE::AS3
public function removeBead(value:IBead):IBead
{
var n:int = _beads.length;
@@ -833,13 +1042,21 @@ package org.apache.flex.core
*/
public function addElement(c:Object, dispatchEvent:Boolean = true):void
{
- if (c is IUIBase)
+ COMPILE::AS3
{
- addChild(IUIBase(c).element as DisplayObject);
- IUIBase(c).addedToParent();
+ if (c is IUIBase)
+ {
+ addChild(IUIBase(c).element as DisplayObject);
+ IUIBase(c).addedToParent();
+ }
+ else
+ addChild(c as DisplayObject);
+ }
+ COMPILE::JS
+ {
+ element.appendChild(c.positioner);
+ c.addedToParent();
}
- else
- addChild(c as DisplayObject);
}
/**
@@ -852,13 +1069,28 @@ package org.apache.flex.core
*/
public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
{
- if (c is IUIBase)
+ COMPILE::AS3
{
- addChildAt(IUIBase(c).element as DisplayObject, index);
- IUIBase(c).addedToParent();
+ if (c is IUIBase)
+ {
+ addChildAt(IUIBase(c).element as DisplayObject, index);
+ IUIBase(c).addedToParent();
+ }
+ else
+ addChildAt(c as DisplayObject, index);
+ }
+ COMPILE::JS
+ {
+ var children:Array = internalChildren();
+ if (index >= children.length)
+ addElement(c);
+ else
+ {
+ element.insertBefore(c.positioner,
+ children[index]);
+ c.addedToParent();
+ }
}
- else
- addChildAt(c as DisplayObject, index);
}
/**
@@ -871,7 +1103,15 @@ package org.apache.flex.core
*/
public function getElementAt(index:int):Object
{
- return getChildAt(index);
+ COMPILE::AS3
+ {
+ return getChildAt(index);
+ }
+ COMPILE::JS
+ {
+ var children:Array = internalChildren();
+ return children[index].flexjs_wrapper;
+ }
}
/**
@@ -884,10 +1124,24 @@ package org.apache.flex.core
*/
public function getElementIndex(c:Object):int
{
- if (c is IUIBase)
- return getChildIndex(IUIBase(c).element as DisplayObject);
- else
- return getChildIndex(c as DisplayObject);
+ COMPILE::AS3
+ {
+ if (c is IUIBase)
+ return getChildIndex(IUIBase(c).element as DisplayObject);
+ else
+ return getChildIndex(c as DisplayObject);
+ }
+ COMPILE::JS
+ {
+ var children:Array = internalChildren();
+ var n:int = children.length;
+ for (var i:int = 0; i < n; i++)
+ {
+ if (children[i] == c.element)
+ return i;
+ }
+ return -1;
+ }
}
/**
@@ -900,10 +1154,17 @@ package org.apache.flex.core
*/
public function removeElement(c:Object, dispatchEvent:Boolean = true):void
{
- if (c is IUIBase)
- removeChild(IUIBase(c).element as DisplayObject);
- else
- removeChild(c as DisplayObject);
+ COMPILE::AS3
+ {
+ if (c is IUIBase)
+ removeChild(IUIBase(c).element as DisplayObject);
+ else
+ removeChild(c as DisplayObject);
+ }
+ COMPILE::JS
+ {
+ element.removeChild(c.element);
+ }
}
/**
@@ -916,7 +1177,15 @@ package org.apache.flex.core
*/
public function get numElements():int
{
- return numChildren;
+ COMPILE::AS3
+ {
+ return numChildren;
+ }
+ COMPILE::JS
+ {
+ var children:Array = internalChildren();
+ return children.length;
+ }
}
/**
@@ -927,11 +1196,19 @@ package org.apache.flex.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion Class
+ * @flexjsignorecoercion Number
*/
public function addedToParent():void
{
var c:Class;
+ COMPILE::JS
+ {
+ if (style)
+ ValuesManager.valuesImpl.applyStyles(this, style);
+ }
+
if (isNaN(_explicitWidth) && isNaN(_percentWidth))
{
var value:* = ValuesManager.valuesImpl.getValue(this,"width");
@@ -1030,6 +1307,7 @@ package org.apache.flex.core
return measurementBead;
}
+ COMPILE::AS3
private var _stageProxy:StageProxy;
/**
@@ -1039,26 +1317,109 @@ package org.apache.flex.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion org.apache.flex.events.IEventDispatcher
*/
public function get topMostEventDispatcher():IEventDispatcher
{
- if (!_stageProxy)
+ COMPILE::AS3
{
- _stageProxy = new StageProxy(stage);
- _stageProxy.addEventListener("removedFromStage", stageProxy_removedFromStageHandler);
+ if (!_stageProxy)
+ {
+ _stageProxy = new StageProxy(stage);
+ _stageProxy.addEventListener("removedFromStage", stageProxy_removedFromStageHandler);
+ }
+
+ return _stageProxy;
+ }
+ COMPILE::JS
+ {
+ var e:WrappedHTMLElement = document.body as WrappedHTMLElement;
+ return e.flexjs_wrapper as IEventDispatcher;
}
-
- return _stageProxy;
}
+ COMPILE::AS3
private function stageProxy_removedFromStageHandler(event:Event):void
{
_stageProxy = null;
}
+ /**
+ * Rebroadcast an event from a sub component from the component.
+ */
protected function repeaterListener(event:Event):void
{
dispatchEvent(event);
}
+
+ /**
+ * The HTMLElement used to position the component.
+ */
+ COMPILE::JS
+ protected var positioner:WrappedHTMLElement = null;
+
+ /**
+ * @return The actual element to be parented.
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ protected function createElement():WrappedHTMLElement
+ {
+ if (element == null)
+ element = document.createElement('div') as WrappedHTMLElement;
+ if (positioner == null)
+ positioner = element;
+ positioner.style.display = 'block';
+ positioner.style.position = 'relative';
+
+ element.flexjs_wrapper = this;
+
+ return positioner;
+ }
+
+
+ /**
+ * The HTMLElement used to position the component.
+ * @flexjsignorecoercion String
+ */
+ COMPILE::JS
+ public function get alpha():Number
+ {
+ var stralpha:String = positioner.style.opacity as String;
+ var alpha:Number = parseFloat(stralpha);
+ return alpha;
+ }
+
+ COMPILE::JS
+ public function set alpha(value:Number):void
+ {
+ positioner.style.opacity = value;
+ }
+
+ /**
+ * @param value The event containing new style properties.
+ */
+ COMPILE::JS
+ protected function styleChangeHandler(value:ValueChangeEvent):void
+ {
+ var newStyle:Object = {};
+ newStyle[value.propertyName] = value.newValue;
+ ValuesManager.valuesImpl.applyStyles(this, newStyle);
+ };
+
+ /**
+ * @param value The event containing new style properties.
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion org.apache.flex.core.IUIBase
+ */
+ COMPILE::JS
+ public function get parent():IUIBase
+ {
+ var p:WrappedHTMLElement = this.positioner.parentNode as WrappedHTMLElement;
+ var wrapper:IUIBase = p ? p.flexjs_wrapper as IUIBase : null;
+ return wrapper;
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
index 6a0cf1d..9a30809 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
@@ -58,7 +58,7 @@ package org.apache.flex.core
* @productversion FlexJS 0.0
*/
COMPILE::AS3
- public class UIButtonBase extends SimpleButton implements IStrandWithModel, IEventDispatcher, IUIBase, IStyleableObject, ILayoutChild
+ public class UIButtonBase extends SimpleButton implements IStrandWithModel, IEventDispatcher, IUIBase, IStyleableObject, ILayoutChild, IFlexJSElement
{
/**
* Constructor.
@@ -510,7 +510,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get model():IBeadModel
+ public function get model():Object
{
if (_model == null)
{
@@ -523,7 +523,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function set model(value:IBeadModel):void
+ public function set model(value:Object):void
{
if (_model != value)
{
@@ -694,7 +694,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get element():Object
+ public function get element():IFlexJSElement
{
return this;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
index cef63ec..376fff7 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
@@ -49,7 +49,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class ViewBase extends ContainerBase implements IPopUpHost
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/events/ElementEvents.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/ElementEvents.as b/frameworks/projects/Core/as/src/org/apache/flex/events/ElementEvents.as
index 6a4b14a..e79762a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/ElementEvents.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/ElementEvents.as
@@ -34,6 +34,11 @@ package org.apache.flex.events
//--------------------------------------
static public const elementEvents:Object = {
+ 'click': 1,
+ 'change': 1,
+ 'keyup': 1,
+ 'keydown': 1,
+ 'load': 1,
'mouseover': 1,
'mouseout': 1,
'mouseup': 1,
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/events/EventDispatcher.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/EventDispatcher.as b/frameworks/projects/Core/as/src/org/apache/flex/events/EventDispatcher.as
index 3e5053c..ceec8ee 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/EventDispatcher.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/EventDispatcher.as
@@ -58,27 +58,9 @@ package org.apache.flex.events
COMPILE::JS
public class EventDispatcher extends goog.events.EventTarget implements IEventDispatcher
{
-
- override public function addEventListener(type:String, handler:Object, opt_capture:Boolean = false, opt_handlerScope:Object = null):void
- {
- super.addEventListener(type, handler, opt_capture, opt_handlerScope);
-
- const that:* = this;
- var source:* = this;
-
- if (that.element && that.element.nodeName &&
- that.element.nodeName.toLowerCase() !== 'div' &&
- that.element.nodeName.toLowerCase() !== 'body')
- {
- source = that.element;
- }
- else if (ElementEvents.elementEvents[type])
- {
- // mouse and keyboard events also dispatch off the element.
- source = that.element;
- }
-
- goog.events.listen(source, type, handler);
- }
+ public function hasEventListener(type:String):Boolean
+ {
+ return goog.events.hasListener(this, type);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as b/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
index 97d8e59..ec35569 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/IEventDispatcher.as
@@ -41,6 +41,8 @@ package org.apache.flex.events
COMPILE::JS
public interface IEventDispatcher
{
-
+ function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void;
+ function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void;
+ //function hasEventListener(type:String):Boolean;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/events/ValueChangeEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/ValueChangeEvent.as b/frameworks/projects/Core/as/src/org/apache/flex/events/ValueChangeEvent.as
index 9befb62..45fabbd 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/ValueChangeEvent.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/ValueChangeEvent.as
@@ -29,7 +29,6 @@ package org.apache.flex.events
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class ValueChangeEvent extends Event
{
/**
@@ -43,7 +42,14 @@ package org.apache.flex.events
public function ValueChangeEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false,
oldValue:Object = null, newValue:Object = null)
{
- super(type, bubbles, cancelable);
+ COMPILE::AS3
+ {
+ super(type, bubbles, cancelable);
+ }
+ COMPILE::JS
+ {
+ super(type);
+ }
this.oldValue = oldValue;
this.newValue = newValue;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/events/ValueEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/events/ValueEvent.as b/frameworks/projects/Core/as/src/org/apache/flex/events/ValueEvent.as
index e1f34a3..6088680 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/events/ValueEvent.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/events/ValueEvent.as
@@ -28,7 +28,6 @@ package org.apache.flex.events
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class ValueEvent extends Event
{
/**
@@ -42,7 +41,16 @@ package org.apache.flex.events
public function ValueEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false,
value:Object = null)
{
- super(type, bubbles, cancelable);
+ COMPILE::AS3
+ {
+ super(type, bubbles, cancelable);
+ }
+
+ COMPILE::JS
+ {
+ super(type);
+ }
+
this.value = value;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/states/AddItems.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/states/AddItems.as b/frameworks/projects/Core/as/src/org/apache/flex/states/AddItems.as
index 7b4a2bd..7f780fa 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/states/AddItems.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/states/AddItems.as
@@ -37,7 +37,6 @@ package org.apache.flex.states
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class AddItems implements IDocument
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/states/ItemAndDescriptor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/states/ItemAndDescriptor.as b/frameworks/projects/Core/as/src/org/apache/flex/states/ItemAndDescriptor.as
index 4116704..308c86e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/states/ItemAndDescriptor.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/states/ItemAndDescriptor.as
@@ -31,7 +31,6 @@ package org.apache.flex.states
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class ItemAndDescriptor
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/states/SetEventHandler.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/states/SetEventHandler.as b/frameworks/projects/Core/as/src/org/apache/flex/states/SetEventHandler.as
index 8865d9f..f3b9ae1 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/states/SetEventHandler.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/states/SetEventHandler.as
@@ -34,7 +34,6 @@ package org.apache.flex.states
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class SetEventHandler implements IDocument
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/states/SetProperty.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/states/SetProperty.as b/frameworks/projects/Core/as/src/org/apache/flex/states/SetProperty.as
index 0528bd7..b6c2e1a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/states/SetProperty.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/states/SetProperty.as
@@ -34,7 +34,6 @@ package org.apache.flex.states
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class SetProperty implements IDocument
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/states/State.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/states/State.as b/frameworks/projects/Core/as/src/org/apache/flex/states/State.as
index 0232505..271e837 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/states/State.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/states/State.as
@@ -33,7 +33,6 @@ package org.apache.flex.states
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class State
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/MXMLDataInterpreter.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
index 89ce693..c69b550 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
@@ -19,7 +19,10 @@
package org.apache.flex.utils
{
-import flash.display.DisplayObject;
+COMPILE::AS3
+{
+ import flash.display.DisplayObject;
+}
import org.apache.flex.core.IBead;
import org.apache.flex.core.IContainer;
@@ -30,6 +33,12 @@ import org.apache.flex.core.IStrand;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
+COMPILE::JS
+{
+ import goog.bind;
+ import org.apache.flex.core.IUIBase;
+}
+
/**
* The MXMLDataInterpreter class is the class that interprets the
* encoded information generated by the compiler that describes
@@ -39,6 +48,7 @@ import org.apache.flex.events.IEventDispatcher;
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignoreimport goog.bind
*/
public class MXMLDataInterpreter
{
@@ -156,6 +166,9 @@ public class MXMLDataInterpreter
return comps;
}
+ /**
+ * @flexjsignorecoercion Function
+ */
private static function initializeStrandBasedObject(document:Object, parent:IParent, comp:Object, data:Array, i:int):int
{
var m:int;
@@ -241,17 +254,23 @@ public class MXMLDataInterpreter
comp.setStyle(name, value);
}
- m = data[i++]; // num effects
- for (j = 0; j < m; j++)
+ COMPILE::AS3
{
- name = data[i++];
- simple = data[i++];
- value = data[i++];
- if (simple == null)
- value = generateMXMLArray(document, null, value as Array);
- else if (simple == false)
- value = generateMXMLObject(document, value as Array);
- comp.setStyle(name, value);
+ // flexjs on the JS side won't have effects in here, they are regular properties
+ // but falcon provides this set for SWFs for future compatibility with
+ // the older flex-sdk.
+ m = data[i++]; // num effects
+ for (j = 0; j < m; j++)
+ {
+ name = data[i++];
+ simple = data[i++];
+ value = data[i++];
+ if (simple == null)
+ value = generateMXMLArray(document, null, value as Array);
+ else if (simple == false)
+ value = generateMXMLObject(document, value as Array);
+ comp.setStyle(name, value);
+ }
}
m = data[i++]; // num events
@@ -259,7 +278,14 @@ public class MXMLDataInterpreter
{
name = data[i++];
value = data[i++];
- comp.addEventListener(name, value);
+ COMPILE::AS3
+ {
+ comp.addEventListener(name, value);
+ }
+ COMPILE::JS
+ {
+ comp.addEventListener(name, goog.bind(value as Function, document));
+ }
}
var children:Array = data[i++];
@@ -267,9 +293,15 @@ public class MXMLDataInterpreter
{
comp.setMXMLDescriptor(document, children);
}
- if (parent && comp is DisplayObject)
+ COMPILE::AS3
{
- parent.addElement(comp, !(parent is IContainer));
+ if (parent && comp is DisplayObject)
+ parent.addElement(comp, !(parent is IContainer));
+ }
+ COMPILE::JS
+ {
+ if (parent && comp is IUIBase)
+ parent.addElement(comp, !(parent is IContainer));
}
if (children)
@@ -327,6 +359,7 @@ public class MXMLDataInterpreter
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion Function
*/
public static function generateMXMLProperties(host:Object, data:Array):void
{
@@ -390,17 +423,23 @@ public class MXMLDataInterpreter
host[name] = value;
}
- m = data[i++]; // num effects
- for (j = 0; j < m; j++)
+ COMPILE::AS3
{
- name = data[i++];
- simple = data[i++];
- value = data[i++];
- if (simple == null)
- value = generateMXMLArray(host, null, value as Array);
- else if (simple == false)
- value = generateMXMLObject(host, value as Array);
- host[name] = value;
+ // flexjs on the JS side won't have effects in here, they are regular properties
+ // but falcon provides this set for SWFs for future compatibility with
+ // the older flex-sdk.
+ m = data[i++]; // num effects
+ for (j = 0; j < m; j++)
+ {
+ name = data[i++];
+ simple = data[i++];
+ value = data[i++];
+ if (simple == null)
+ value = generateMXMLArray(host, null, value as Array);
+ else if (simple == false)
+ value = generateMXMLObject(host, value as Array);
+ host[name] = value;
+ }
}
m = data[i++]; // num events
@@ -408,7 +447,14 @@ public class MXMLDataInterpreter
{
name = data[i++];
value = data[i++];
- host.addEventListener(name, value as Function);
+ COMPILE::AS3
+ {
+ host.addEventListener(name, value as Function);
+ }
+ COMPILE::JS
+ {
+ host.addEventListener(name, goog.bind(value as Function, host));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as b/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
index da0b027..23a1324 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/utils/ViewSourceContextMenuOption.as
@@ -40,7 +40,6 @@ import org.apache.flex.core.IStrand;
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
-COMPILE::AS3
public class ViewSourceContextMenuOption implements IBead
{
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/asjs/src/org/apache/flex/utils/CSSUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/src/org/apache/flex/utils/CSSUtils.as b/frameworks/projects/Core/asjs/src/org/apache/flex/utils/CSSUtils.as
index 16c37d7..9be0e06 100644
--- a/frameworks/projects/Core/asjs/src/org/apache/flex/utils/CSSUtils.as
+++ b/frameworks/projects/Core/asjs/src/org/apache/flex/utils/CSSUtils.as
@@ -28,7 +28,6 @@ package org.apache.flex.utils
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- COMPILE::AS3
public class CSSUtils
{
/**
[22/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
more tweaks for FireFox
Posted by ah...@apache.org.
more tweaks for FireFox
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8677a786
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8677a786
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8677a786
Branch: refs/heads/core_js_to_as
Commit: 8677a786a46cd0f3485877856642fb4ce2afe2af
Parents: 1a580f4
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 15 09:55:43 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 15 09:55:43 2015 -0700
----------------------------------------------------------------------
.../projects/Flat/js/src/org/apache/flex/flat/DropDownList.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8677a786/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
index 9b242d8..561f23c 100644
--- a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
@@ -203,8 +203,8 @@ org.apache.flex.flat.DropDownList.prototype.addedToParent = function() {
s = /** @type {string} */ (cv.borderRightWidth);
var br = org.apache.flex.utils.CSSUtils.toNumber(s);
var caretWidth = this.caret.offsetWidth;
- // is 4 for spacing between spans?
- var fluff = pl + pr + bl + br + caretWidth + 1 + 4;
+ // 10 seems to factor spacing between span and extra FF padding?
+ var fluff = pl + pr + bl + br + caretWidth + 1 + 10;
var labelWidth = this.width - fluff;
var strWidth = labelWidth.toString();
strWidth += 'px';
[05/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
eat errors
Posted by ah...@apache.org.
eat errors
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c9bd62d6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c9bd62d6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c9bd62d6
Branch: refs/heads/core_js_to_as
Commit: c9bd62d613c1fb82e2b5b109f645f6c1ded7e006
Parents: 9e5abdf
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 8 23:19:31 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:16 2015 -0700
----------------------------------------------------------------------
.../Binding/as/src/org/apache/flex/binding/SimpleBinding.as | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9bd62d6/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as b/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
index fa86ed1..386571c 100644
--- a/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
+++ b/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
@@ -157,7 +157,11 @@ package org.apache.flex.binding
else
source = document as IEventDispatcher;
source.addEventListener(eventName, changeHandler);
- destination[destinationPropertyName] = source[sourcePropertyName];
+ try
+ {
+ destination[destinationPropertyName] = source[sourcePropertyName];
+ }
+ catch (e:Error) {}
}
/**
[17/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
IE doesn't like document.contains, only document.body.contains
Posted by ah...@apache.org.
IE doesn't like document.contains, only document.body.contains
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f2b10865
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f2b10865
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f2b10865
Branch: refs/heads/core_js_to_as
Commit: f2b1086568a52ec1444d77f076ee0db859bf9e96
Parents: 029ee8c
Author: Alex Harui <ah...@apache.org>
Authored: Mon Sep 14 08:27:09 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Sep 14 08:27:09 2015 -0700
----------------------------------------------------------------------
.../HTML/js/src/org/apache/flex/html/beads/ContainerView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f2b10865/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
index 9ffa43d..be440cd 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
@@ -85,7 +85,7 @@ org.apache.flex.html.beads.ContainerView.
var num = this.contentView.numElements;
// make sure there are children AND you are in the DOM before laying out.
// If not in the DOM, you'll get funky numbers
- if (num > 0 && document.contains(this.host.element)) {
+ if (num > 0 && document.body.contains(this.host.element)) {
this.performLayout(event);
}
}
[11/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
replace support_map with public domain image
Posted by ah...@apache.org.
replace support_map with public domain image
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cc7f0d01
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cc7f0d01
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cc7f0d01
Branch: refs/heads/core_js_to_as
Commit: cc7f0d01b3155104e9303f9eabd3b9095bfc7ee5
Parents: b5a5a4e
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:36:14 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:36:14 2015 -0700
----------------------------------------------------------------------
LICENSE | 5 +++++
examples/flexjs/FlexJSStore/src/SupportView.mxml | 4 ++--
.../FlexJSStore/src/assets/427px-Bayarea_map.png | Bin 0 -> 122661 bytes
.../flexjs/FlexJSStore/src/assets/support_map.png | Bin 172293 -> 0 bytes
.../FlexJSStore_jquery/src/SupportView.mxml | 4 ++--
.../src/assets/427px-Bayarea_map.png | Bin 0 -> 122661 bytes
.../FlexJSStore_jquery/src/assets/support_map.png | Bin 172293 -> 0 bytes
7 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 21f2725..439f630 100644
--- a/LICENSE
+++ b/LICENSE
@@ -213,3 +213,8 @@ conditions of the following licenses.
Portions of frameworks/projects/Flat/as/defaults.css is based on
designmodo’s (http://designmodo.com/flat-free/) Flat UI which is
available under an MIT license.
+
+The map image examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
+was placed into the Public Domain by its author. See:
+https://commons.wikimedia.org/wiki/File:Bayarea_map.png
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore/src/SupportView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/SupportView.mxml b/examples/flexjs/FlexJSStore/src/SupportView.mxml
index c0579e4..ab3eea7 100755
--- a/examples/flexjs/FlexJSStore/src/SupportView.mxml
+++ b/examples/flexjs/FlexJSStore/src/SupportView.mxml
@@ -137,9 +137,9 @@ The width and height are hard-coded in the root tag to help the Design view.
</js:VContainer>
<js:Container width="68%" height="100%">
- <js:Image source="assets/support_map.png">
+ <js:Image source="assets/427px-Bayarea_map.png">
<js:style>
- <js:SimpleCSSStyles left="2" right="2" top="2" bottom="2"/>
+ <js:SimpleCSSStyles left="12" top="12"/>
</js:style>
</js:Image>
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png b/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
new file mode 100644
index 0000000..a183699
Binary files /dev/null and b/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore/src/assets/support_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/assets/support_map.png b/examples/flexjs/FlexJSStore/src/assets/support_map.png
deleted file mode 100755
index c2f2394..0000000
Binary files a/examples/flexjs/FlexJSStore/src/assets/support_map.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml b/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
index c0579e4..ab3eea7 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
@@ -137,9 +137,9 @@ The width and height are hard-coded in the root tag to help the Design view.
</js:VContainer>
<js:Container width="68%" height="100%">
- <js:Image source="assets/support_map.png">
+ <js:Image source="assets/427px-Bayarea_map.png">
<js:style>
- <js:SimpleCSSStyles left="2" right="2" top="2" bottom="2"/>
+ <js:SimpleCSSStyles left="12" top="12"/>
</js:style>
</js:Image>
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png b/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png
new file mode 100644
index 0000000..a183699
Binary files /dev/null and b/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png b/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png
deleted file mode 100755
index c2f2394..0000000
Binary files a/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png and /dev/null differ
[41/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
FlexJSStore demo needs list item to have its width set to trigger its
internal layout.
Posted by ah...@apache.org.
FlexJSStore demo needs list item to have its width set to trigger its internal layout.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d07030ff
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d07030ff
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d07030ff
Branch: refs/heads/core_js_to_as
Commit: d07030ff635d74339d28301e14e7917de50d56be
Parents: 4dd82db
Author: Peter Ent <pe...@apache.org>
Authored: Wed Sep 23 16:49:21 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Sep 23 16:49:21 2015 -0400
----------------------------------------------------------------------
examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d07030ff/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml b/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
index 951b1fa..18a2b7a 100755
--- a/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
+++ b/examples/flexjs/FlexJSStore/src/productsView/ProductList.mxml
@@ -138,6 +138,7 @@ limitations under the License.
for (var i:int = startIndex; i < n ; i++)
{
var item:ProductListItem = items[i];
+ item.width = width;
var yTo:Number = i * (item.height);
//still need to prevent items that are already in motion from getting
//jumpy
[06/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
handle units for left/right
Posted by ah...@apache.org.
handle units for left/right
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e7c02358
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e7c02358
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e7c02358
Branch: refs/heads/core_js_to_as
Commit: e7c023589ed450556a6ff950c96124048624c00a
Parents: 019e958
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:10:39 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:17 2015 -0700
----------------------------------------------------------------------
.../flex/html/beads/layouts/VerticalLayout.as | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e7c02358/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
index 53f60ce..675a586 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
@@ -28,10 +28,10 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.geom.Rectangle;
+ import org.apache.flex.geom.Rectangle;
+ import org.apache.flex.utils.CSSContainerUtils;
+ import org.apache.flex.utils.CSSUtils;
import org.apache.flex.utils.dbg.DOMPathUtil;
- import org.apache.flex.utils.CSSUtils;
- import org.apache.flex.utils.CSSContainerUtils;
/**
* The VerticalLayout class is a simple layout
@@ -93,6 +93,7 @@ package org.apache.flex.html.beads.layouts
var marginBottom:Object;
var margin:Object;
var maxWidth:Number = 0;
+ var cssValue:*;
// asking for contentView.width can result in infinite loop if host isn't sized already
var w:Number = hostSizedToContent ? 0 : contentView.width;
var h:Number = contentView.height;
@@ -102,8 +103,14 @@ package org.apache.flex.html.beads.layouts
var child:IUIBase = contentView.getElementAt(i) as IUIBase;
if (child == null || !child.visible) continue;
ilc = child as ILayoutChild;
- var left:Number = ValuesManager.valuesImpl.getValue(child, "left");
- var right:Number = ValuesManager.valuesImpl.getValue(child, "right");
+ var left:Number = NaN;
+ cssValue = ValuesManager.valuesImpl.getValue(child, "left");
+ if (cssValue !== undefined)
+ left = CSSUtils.toNumber(cssValue);
+ var right:Number = NaN;
+ cssValue = ValuesManager.valuesImpl.getValue(child, "right");
+ if (cssValue !== undefined)
+ right = CSSUtils.toNumber(cssValue);
margin = ValuesManager.valuesImpl.getValue(child, "margin");
marginLeft = ValuesManager.valuesImpl.getValue(child, "margin-left");
marginTop = ValuesManager.valuesImpl.getValue(child, "margin-top");
[34/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Remove dependency on IInputParser. Subclass JSONInputParser instead.
Posted by ah...@apache.org.
Remove dependency on IInputParser. Subclass JSONInputParser instead.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5c13f2bd
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5c13f2bd
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5c13f2bd
Branch: refs/heads/core_js_to_as
Commit: 5c13f2bd8a6d60384e17627ff5881505ec0c41d2
Parents: 84ece7b
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Mon Sep 21 13:28:17 2015 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Mon Sep 21 13:29:30 2015 -0700
----------------------------------------------------------------------
examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml | 3 ---
.../src/controllers/GAJSONInputParser.as | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c13f2bd/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml b/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml
index a389c83..33842df 100644
--- a/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml
@@ -51,9 +51,6 @@ limitations under the License.
}
</fx:Style>
- <js:beads>
- <js:ViewBaseDataBinding />
- </js:beads>
<js:Label text="Number of users on flex.apache.org for last 30 days" x="10" y="10" />
<js:TextButton id="refreshButton" text="Refresh" x="300" y="10" click="refreshBtnClick(event)"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c13f2bd/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
index bb2a09d..2ff5916 100644
--- a/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
@@ -1,14 +1,14 @@
package controllers
{
- import org.apache.flex.collections.parsers.IInputParser;
+ import org.apache.flex.collections.parsers.JSONInputParser;
- public class GAJSONInputParser implements IInputParser
+ public class GAJSONInputParser extends JSONInputParser
{
public function GAJSONInputParser()
{
}
- public function parseItems(s:String):Array
+ override public function parseItems(s:String):Array
{
var rowsArrayStartIndex:int = s.indexOf('"rows": [', 0);
var rowsArrayEndIndex:int = s.indexOf("]]", rowsArrayStartIndex);
[30/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Add new example FlexWebsiteStatsViewer. This examples fetches data from
Google Analytics for the website: flex.apache.org,
and parses the data into the required format. Then, via data
Posted by ah...@apache.org.
Add new example FlexWebsiteStatsViewer. This examples fetches data from Google Analytics for the website: flex.apache.org,
and parses the data into the required format. Then, via data binding, updates the dataprovider for a ColumnChart which renders the data.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e28d38e8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e28d38e8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e28d38e8
Branch: refs/heads/core_js_to_as
Commit: e28d38e8688877793108bc2d49a2eed558ab8996
Parents: 892fd75
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Mon Sep 21 04:16:16 2015 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Mon Sep 21 04:16:16 2015 -0700
----------------------------------------------------------------------
.../flexjs/FlexWebsiteStatsViewer/build.xml | 74 +++++++++++++++++
examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 74 +++++++++++++++++
.../src/FlexWebsiteStatsViewer.mxml | 55 +++++++++++++
.../FlexWebsiteStatsViewer/src/README.txt | 23 ++++++
.../FlexWebsiteStatsViewer/src/StatsView.mxml | 86 ++++++++++++++++++++
.../src/controllers/GAJSONInputParser.as | 20 +++++
.../controllers/GAStatsDataJSONItemConverter.as | 41 ++++++++++
.../src/controllers/StatsController.as | 77 ++++++++++++++++++
.../src/models/StatsModel.as | 55 +++++++++++++
9 files changed, 505 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/build.xml b/examples/flexjs/FlexWebsiteStatsViewer/build.xml
new file mode 100644
index 0000000..20b4415
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/build.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+
+
+<project name="chartexample" default="main" basedir=".">
+ <property name="FLEXJS_HOME" location="../../.."/>
+ <property name="example" value="ChartExample" />
+
+ <property file="${FLEXJS_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FLEXJS_HOME}/build.properties"/>
+ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
+ type="file"
+ property="FALCON_HOME"
+ value="${env.FALCON_HOME}"/>
+
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
+ type="file"
+ property="FALCON_HOME"
+ value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
+
+ <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
+ type="file"
+ property="FALCONJX_HOME"
+ value="${env.FALCONJX_HOME}"/>
+
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
+ type="file"
+ property="FALCONJX_HOME"
+ value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
+
+ <available file="${env.GOOG_HOME}/closure/goog/base.js"
+ type="file"
+ property="GOOG_HOME"
+ value="${env.GOOG_HOME}"/>
+
+ <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
+ type="file"
+ property="GOOG_HOME"
+ value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+
+ <include file="${basedir}/../../build_example.xml" />
+
+<!-- temp remove build_example.compilejs -->
+ <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
+ </target>
+
+ <target name="clean">
+ <delete dir="${basedir}/bin" failonerror="false" />
+ <delete dir="${basedir}/bin-debug" failonerror="false" />
+ <delete dir="${basedir}/bin-release" failonerror="false" />
+ </target>
+
+
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
new file mode 100644
index 0000000..02414b8
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>FlexWebsiteStatsViewer</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>FlexWebsiteStatsViewer.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/src/FlexWebsiteStatsViewer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/FlexWebsiteStatsViewer.mxml b/examples/flexjs/FlexWebsiteStatsViewer/src/FlexWebsiteStatsViewer.mxml
new file mode 100644
index 0000000..9aafac9
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/FlexWebsiteStatsViewer.mxml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+-->
+<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:local="*"
+ xmlns:models="models.*"
+ xmlns:controllers="controllers.*"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ initialize="trace('app initialized')"
+ >
+ <js:valuesImpl>
+ <js:SimpleCSSValuesImpl />
+ </js:valuesImpl>
+ <js:initialView>
+ <local:StatsView />
+ </js:initialView>
+ <js:model>
+ <models:StatsModel />
+ </js:model>
+ <js:controller>
+ <controllers:StatsController />
+ </js:controller>
+ <js:beads>
+ <js:BrowserScroller />
+ <js:HTTPService id="service">
+ <js:LazyCollection id="collection">
+ <js:inputParser>
+ <controllers:GAJSONInputParser />
+ </js:inputParser>
+ <js:itemConverter>
+ <controllers:GAStatsDataJSONItemConverter />
+ </js:itemConverter>
+ </js:LazyCollection>
+ </js:HTTPService>
+ <js:CSSFontFaceBead />
+ </js:beads>
+</js:Application>
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/src/README.txt
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/README.txt b/examples/flexjs/FlexWebsiteStatsViewer/src/README.txt
new file mode 100644
index 0000000..0b1e0f3
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/README.txt
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+This examples fetches data from Google Analytics for the website: flex.apache.org,
+and parses the data into the required format. Then, via data binding, updates
+the dataprovider for a ColumnChart which renders the data.
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml b/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml
new file mode 100644
index 0000000..a389c83
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/StatsView.mxml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+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.
+
+-->
+<js:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ xmlns:local="*"
+ xmlns:models="models.*"
+ initComplete="testit()"
+ >
+ <fx:Script>
+ <![CDATA[
+
+ private function testit():void
+ {
+ trace();
+ }
+
+ private function refreshBtnClick(event:Event):void
+ {
+ var e:Event = new Event("refresh",true);
+ dispatchEvent(e);
+ }
+
+ ]]>
+ </fx:Script>
+
+ <fx:Style>
+ @namespace js "library://ns.apache.org/flexjs/basic";
+ .AllCharts {
+ border-width: 0px;
+ padding-left: 2px;
+ padding-top: 10px;
+ padding-bottom: 2px;
+ padding-right: 10px;
+ }
+ </fx:Style>
+
+ <js:beads>
+ <js:ViewBaseDataBinding />
+ </js:beads>
+
+ <js:Label text="Number of users on flex.apache.org for last 30 days" x="10" y="10" />
+ <js:TextButton id="refreshButton" text="Refresh" x="300" y="10" click="refreshBtnClick(event)"/>
+
+ <js:ColumnChart id="columnChart" x="40" y="40" width="1024" height="768" className="AllCharts">
+ <js:beads>
+ <js:SimpleBinding
+ sourceID="applicationModel"
+ sourcePropertyName="lastThirtyDaysUsers"
+ destinationPropertyName="dataProvider"
+ eventName="lastThirtyDaysDataChanged"
+ />
+ <js:HorizontalCategoryAxisBead categoryField="date" />
+ <js:VerticalLinearAxisBead valueField="users" />
+ </js:beads>
+ <js:series>
+ <js:ColumnSeries yField="users">
+ <js:itemRenderer>
+ <fx:Component>
+ <js:BoxItemRenderer>
+ <js:fill>
+ <js:SolidColor color="#FF964D" alpha="1.0" />
+ </js:fill>
+ </js:BoxItemRenderer>
+ </fx:Component>
+ </js:itemRenderer>
+ </js:ColumnSeries>
+ </js:series>
+ </js:ColumnChart>
+</js:ViewBase>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
new file mode 100644
index 0000000..bb2a09d
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
@@ -0,0 +1,20 @@
+package controllers
+{
+ import org.apache.flex.collections.parsers.IInputParser;
+
+ public class GAJSONInputParser implements IInputParser
+ {
+ public function GAJSONInputParser()
+ {
+ }
+
+ public function parseItems(s:String):Array
+ {
+ var rowsArrayStartIndex:int = s.indexOf('"rows": [', 0);
+ var rowsArrayEndIndex:int = s.indexOf("]]", rowsArrayStartIndex);
+ var rowsArrayString:String = s.slice(rowsArrayStartIndex + 9,rowsArrayEndIndex);
+ var rowsArray:Array = rowsArrayString.split("],");
+ return rowsArray;
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAStatsDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAStatsDataJSONItemConverter.as b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAStatsDataJSONItemConverter.as
new file mode 100644
index 0000000..608db8f
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAStatsDataJSONItemConverter.as
@@ -0,0 +1,41 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 controllers
+{
+ import org.apache.flex.collections.converters.JSONItemConverter;
+
+ public class GAStatsDataJSONItemConverter extends JSONItemConverter
+ {
+ public function GAStatsDataJSONItemConverter()
+ {
+ super();
+ }
+
+ override public function convertItem(data:String):Object
+ {
+ var obj:Object = {};
+ var a:Array = data.split(",");
+ var dateStr:String = a[0];
+ var usersStr:String = a[1];
+ obj.date = dateStr.substring(dateStr.indexOf("[") + 2 , dateStr.lastIndexOf('"'));
+ obj.users = parseInt(usersStr.substring(usersStr.indexOf(' "') + 2, usersStr.lastIndexOf('"')));
+ return obj;
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/StatsController.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/StatsController.as b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/StatsController.as
new file mode 100644
index 0000000..b4a054c
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/StatsController.as
@@ -0,0 +1,77 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 controllers
+{
+
+ import models.StatsModel;
+
+ import org.apache.flex.core.Application;
+ import org.apache.flex.core.IDocument;
+ import org.apache.flex.events.Event;
+
+ public class StatsController implements IDocument
+ {
+ public function StatsController(a:Application = null)
+ {
+ if (a)
+ {
+ this.app = a as FlexWebsiteStatsViewer;
+ this.app.addEventListener("viewChanged", viewChangeHandler);
+ }
+ }
+
+ private var lastThirtyDaysUsers:String = 'https://apache-flex-dashboard.appspot.com/query?id=ahdzfmFwYWNoZS1mbGV4LWRhc2hib2FyZHIVCxIIQXBpUXVlcnkYgICAgICAgAoM&format=json'
+
+ private var app:FlexWebsiteStatsViewer;
+
+ private function viewChangeHandler(event:Event):void
+ {
+ app.initialView.addEventListener("refresh", buttonClickHandler);
+ }
+
+ private function buttonClickHandler(event:Event):void
+ {
+ app.service.url = lastThirtyDaysUsers;
+ app.service.send();
+ app.service.addEventListener("complete", completeHandler);
+ }
+
+ private function completeHandler(event:Event):void
+ {
+ var lastThirtyDaysUsers:Array = [];
+ if(app.collection)
+ {
+ for (var i:int = 0; i < app.collection.length; i++)
+ {
+ lastThirtyDaysUsers.push(app.collection.getItemAt(i))
+ }
+
+ }
+
+ StatsModel(app.model).lastThirtyDaysUsers = lastThirtyDaysUsers;
+ }
+
+ public function setDocument(document:Object, id:String = null):void
+ {
+ this.app = document as FlexWebsiteStatsViewer;
+ app.addEventListener("viewChanged", viewChangeHandler);
+ }
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e28d38e8/examples/flexjs/FlexWebsiteStatsViewer/src/models/StatsModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/models/StatsModel.as b/examples/flexjs/FlexWebsiteStatsViewer/src/models/StatsModel.as
new file mode 100644
index 0000000..d6d1254
--- /dev/null
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/models/StatsModel.as
@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 models
+{
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+
+ public class StatsModel extends EventDispatcher
+ {
+ private var _lastThirtyDaysUsers:Array;
+ public function StatsModel()
+ {
+
+ }
+
+ [Bindable("lastThirtyDaysDataChanged")]
+ public function get lastThirtyDaysUsers():Array
+ {
+ return _lastThirtyDaysUsers;
+ }
+
+ public function set lastThirtyDaysUsers(v:Array):void
+ {
+ if(v != _lastThirtyDaysUsers)
+ {
+ _lastThirtyDaysUsers = v;
+ dispatchEvent(new Event("lastThirtyDaysDataChanged"));
+ }
+ }
+
+ private var _labelFields:Array = [ "date", "users"];
+ public function get labelFields():Array
+ {
+ return _labelFields;
+ }
+
+ }
+
+}
[21/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
implement browser resize handling and application minWidth/minHeight
Posted by ah...@apache.org.
implement browser resize handling and application minWidth/minHeight
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1a580f49
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1a580f49
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1a580f49
Branch: refs/heads/core_js_to_as
Commit: 1a580f49a3f37632a4e7bddc74364a04de1dba59
Parents: 7d03090
Author: Alex Harui <ah...@apache.org>
Authored: Mon Sep 14 23:37:33 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Sep 14 23:37:33 2015 -0700
----------------------------------------------------------------------
.../as/src/org/apache/flex/core/Application.as | 19 +++-
.../apache/flex/core/BrowserResizeListener.as | 110 +++++++++++++++++++
.../src/org/apache/flex/core/BrowserScroller.as | 1 -
frameworks/projects/Core/basic-manifest.xml | 1 +
.../js/src/org/apache/flex/core/Application.js | 3 +-
.../apache/flex/core/BrowserResizeListener.js | 78 +++++++++++++
6 files changed, 204 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a580f49/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
index 0d933b6..fbcf83b 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
@@ -183,12 +183,19 @@ package org.apache.flex.core
{
initialView.applicationModel = model;
this.addElement(initialView);
- if (!isNaN(initialView.percentWidth) && !isNaN(initialView.percentHeight))
- initialView.setWidthAndHeight(stage.stageWidth, stage.stageHeight, true);
- else if (!isNaN(initialView.percentWidth))
- initialView.setWidth(stage.stageWidth);
- else if (!isNaN(initialView.percentHeight))
- initialView.setHeight(stage.stageHeight);
+ // if someone has installed a resize listener, fake an event to run it now
+ if (stage.hasEventListener("resize"))
+ stage.dispatchEvent(new flash.events.Event("resize"));
+ else
+ {
+ // otherwise, size once like this
+ if (!isNaN(initialView.percentWidth) && !isNaN(initialView.percentHeight))
+ initialView.setWidthAndHeight(stage.stageWidth, stage.stageHeight, true);
+ else if (!isNaN(initialView.percentWidth))
+ initialView.setWidth(stage.stageWidth);
+ else if (!isNaN(initialView.percentHeight))
+ initialView.setHeight(stage.stageHeight);
+ }
var bgColor:Object = ValuesManager.valuesImpl.getValue(this, "background-color");
if (bgColor != null)
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a580f49/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as
new file mode 100644
index 0000000..21544ca
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserResizeListener.as
@@ -0,0 +1,110 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.core
+{
+ import flash.events.Event;
+ import flash.external.ExternalInterface;
+ import flash.utils.getQualifiedClassName;
+
+ /**
+ * The BrowserResizeListener class listens for browser
+ * resizing and resizes the application accordingly.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class BrowserResizeListener implements IBead
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function BrowserResizeListener()
+ {
+ }
+
+ private var app:Application;
+
+ /**
+ * Minimum height
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public var minHeight:Number;
+
+ /**
+ * Minimum width
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public var minWidth:Number;
+
+ /**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ app = value as Application;
+ app.stage.addEventListener("resize", resizeHandler);
+ if (ExternalInterface.available && (!isNaN(minWidth) || !isNaN(minHeight)))
+ {
+ // Get application name. This assumes that the wrapper is using an
+ // object tag with the id that matches the application name
+ var appName:String = getQualifiedClassName(app);
+ var js:String = "var o = document.getElementById('" + appName + "');";
+ if (!isNaN(minWidth))
+ js += "o.style.minWidth = '" + minWidth.toString() + "px';";
+ if (!isNaN(minHeight))
+ js += "o.style.minHeight = '" + minHeight.toString() + "px';"
+ ExternalInterface.call("eval", js);
+ }
+ }
+
+ private function resizeHandler(event:Event):void
+ {
+ var initialView:UIBase = app.initialView;
+ if (!isNaN(initialView.percentWidth) && !isNaN(initialView.percentHeight))
+ initialView.setWidthAndHeight(Math.max(minWidth, app.stage.stageWidth),
+ Math.max(minHeight, app.stage.stageHeight), true);
+ else if (!isNaN(initialView.percentWidth))
+ initialView.setWidth(Math.max(minWidth, app.stage.stageWidth));
+ else if (!isNaN(initialView.percentHeight))
+ initialView.setHeight(Math.max(minHeight, app.stage.stageHeight));
+
+ }
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a580f49/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserScroller.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserScroller.as b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserScroller.as
index 355453a..544c056 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserScroller.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/BrowserScroller.as
@@ -64,7 +64,6 @@ package org.apache.flex.core
private function viewChangedHandler(event:Event):void
{
- // some day also listen to initial view for size changes
if (ExternalInterface.available)
{
// Get application name. This assumes that the wrapper is using an
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a580f49/frameworks/projects/Core/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/basic-manifest.xml b/frameworks/projects/Core/basic-manifest.xml
index 65f0db8..97a664b 100644
--- a/frameworks/projects/Core/basic-manifest.xml
+++ b/frameworks/projects/Core/basic-manifest.xml
@@ -23,6 +23,7 @@
<component id="Application" class="org.apache.flex.core.Application"/>
<component id="BrowserScroller" class="org.apache.flex.core.BrowserScroller"/>
+ <component id="BrowserResizeHandler" class="org.apache.flex.core.BrowserResizeListener"/>
<component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/>
<component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
<component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a580f49/frameworks/projects/Core/js/src/org/apache/flex/core/Application.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/Application.js b/frameworks/projects/Core/js/src/org/apache/flex/core/Application.js
index 8ac8d91..2887da2 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/Application.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/Application.js
@@ -72,7 +72,8 @@ org.apache.flex.core.Application.prototype.start = function() {
this.element = document.getElementsByTagName('body')[0];
this.element.flexjs_wrapper = this;
this.element.className = 'Application';
- this.element.style.overflow = 'hidden';
+ if (!this.element.style.overflow)
+ this.element.style.overflow = 'hidden';
org.apache.flex.utils.MXMLDataInterpreter.generateMXMLInstances(this, null, this.MXMLDescriptor);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a580f49/frameworks/projects/Core/js/src/org/apache/flex/core/BrowserResizeListener.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/BrowserResizeListener.js b/frameworks/projects/Core/js/src/org/apache/flex/core/BrowserResizeListener.js
new file mode 100644
index 0000000..1e16897
--- /dev/null
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/BrowserResizeListener.js
@@ -0,0 +1,78 @@
+/**
+ * Licensed 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.
+ */
+
+goog.provide('org.apache.flex.core.BrowserResizeListener');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.core.BrowserResizeListener = function() {
+ this.strand_ = null;
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.core.BrowserResizeListener.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'BrowserResizeListener',
+ qName: 'org.apache.flex.core.BrowserResizeListener'}]};
+
+
+/**
+ * @type {number}
+ */
+org.apache.flex.core.BrowserResizeListener.prototype.minHeight = NaN;
+
+
+/**
+ * @type {number}
+ */
+org.apache.flex.core.BrowserResizeListener.prototype.minWidth = NaN;
+
+
+/**
+ * @param {Event} e The event.
+ */
+org.apache.flex.core.BrowserResizeListener.prototype.resizeHandler = function(e) {
+ var initialView = this.strand_.initialView;
+ var element = this.strand_.element;
+ if (!isNaN(initialView.percentWidth) || !isNaN(initialView.percentHeight)) {
+ element.style.height = window.innerHeight.toString() + 'px';
+ element.style.width = window.innerWidth.toString() + 'px';
+ initialView.dispatchEvent('sizeChanged'); // kick off layout if % sizes
+ }
+};
+
+
+Object.defineProperties(org.apache.flex.core.BrowserResizeListener.prototype, {
+ /** @export */
+ strand: {
+ /** @this {org.apache.flex.core.BrowserResizeListener} */
+ set: function(value) {
+ this.strand_ = value;
+ window.addEventListener('resize',
+ goog.bind(this.resizeHandler, this));
+ if (!isNaN(this.minWidth))
+ document.body.style.minWidth = this.minWidth.toString() + 'px';
+ if (!isNaN(this.minHeight))
+ document.body.style.minHeight = this.minHeight.toString() + 'px';
+ document.body.style.overflow = 'auto';
+ }
+ }
+});
[37/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
- Added FlexWebsiteStatsViewer to the maven build
Posted by ah...@apache.org.
- Added FlexWebsiteStatsViewer to the maven build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2b3a0c0a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2b3a0c0a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2b3a0c0a
Branch: refs/heads/core_js_to_as
Commit: 2b3a0c0a0cdba552f5bc0a86c8c02ed88384a19f
Parents: 0a2fbbd
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Sep 22 22:15:08 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Sep 22 22:15:08 2015 +0200
----------------------------------------------------------------------
examples/flexjs/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3a0c0a/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index a185d81..8069bbb 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -29,9 +29,9 @@
<properties>
<!-- Comment this in to build Flash output -->
- <!--flexmojos-compiler-name>Falcon</flexmojos-compiler-name-->
+ <flexmojos-compiler-name>Falcon</flexmojos-compiler-name>
<!-- Comment this in to build HTML+JavaScript output -->
- <flexmojos-compiler-name>FlexJS</flexmojos-compiler-name>
+ <!--flexmojos-compiler-name>FlexJS</flexmojos-compiler-name-->
</properties>
@@ -44,7 +44,7 @@
This tag could not be resolved to an ActionScript class. It will be ignored.
<js:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
-->
- <!--module>DataBindingExample_Flat</module-->
+ <module>DataBindingExample_Flat</module>
<module>DataGridExample</module>
<module>DesktopMap</module>
<!--
@@ -55,6 +55,7 @@
"Ambiguous reference to MouseEvent" problem
-->
<!--module>FlexJSStore</module-->
+ <module>FlexWebsiteStatsViewer</module>
<module>MapSearch</module>
<!--
Implicit coercion of a value with static type Event to a possibly unrelated type Event.
[12/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
tweak logo a bit
Posted by ah...@apache.org.
tweak logo a bit
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/00072128
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/00072128
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/00072128
Branch: refs/heads/core_js_to_as
Commit: 00072128ab96f897a0e480dfdd363145bd167f31
Parents: cc7f0d0
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 15:18:38 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 15:18:46 2015 -0700
----------------------------------------------------------------------
.../FlexJSStore/src/assets/logo_orange.png | Bin 34199 -> 34166 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/00072128/examples/flexjs/FlexJSStore/src/assets/logo_orange.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/assets/logo_orange.png b/examples/flexjs/FlexJSStore/src/assets/logo_orange.png
index e3ff7a6..0ce7dc4 100755
Binary files a/examples/flexjs/FlexJSStore/src/assets/logo_orange.png and b/examples/flexjs/FlexJSStore/src/assets/logo_orange.png differ
[33/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Added internal check to see if view has been set before creating a new one.
Removed references to "actualParent" which is no longer needed.
Posted by ah...@apache.org.
Added internal check to see if view has been set before creating a new one. Removed references to "actualParent" which is no longer needed.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/84ece7b7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/84ece7b7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/84ece7b7
Branch: refs/heads/core_js_to_as
Commit: 84ece7b7faf4cfbd5dd81a8d96e2c1aca23082f8
Parents: a6eb386
Author: Peter Ent <pe...@apache.org>
Authored: Mon Sep 21 15:11:55 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Sep 21 15:11:55 2015 -0400
----------------------------------------------------------------------
.../Core/as/src/org/apache/flex/core/UIBase.as | 2 +-
.../js/src/org/apache/flex/core/ContainerBase.js | 19 -------------------
.../Core/js/src/org/apache/flex/core/UIBase.js | 6 ++++--
.../html/supportClasses/ContainerContentArea.as | 2 +-
.../js/src/org/apache/flex/html/Container.js | 4 ++--
5 files changed, 8 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84ece7b7/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
index 3f00b32..b263664 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
@@ -988,7 +988,7 @@ package org.apache.flex.core
addBead(model);
}
}
- if (getBeadByType(IBeadView) == null)
+ if (_view == null && getBeadByType(IBeadView) == null)
{
c = ValuesManager.valuesImpl.getValue(this, "iBeadView") as Class;
if (c)
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84ece7b7/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
index 593a11c..1441721 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
@@ -63,7 +63,6 @@ org.apache.flex.core.ContainerBase = function() {
this.strandChildren_ = new org.apache.flex.core.ContainerBaseStrandChildren(this);
this.document = this;
- this.actualParent_ = this;
};
goog.inherits(org.apache.flex.core.ContainerBase,
@@ -91,13 +90,6 @@ org.apache.flex.core.ContainerBase.prototype.mxmlsd = null;
/**
- * @private
- * @type {Object}
- */
-org.apache.flex.core.ContainerBase.prototype.actualParent_ = null;
-
-
-/**
* @export
* @type {boolean}
*/
@@ -377,17 +369,6 @@ Object.defineProperties(org.apache.flex.core.ContainerBase.prototype, {
}
},
/** @export */
- actualParent: {
- /** @this {org.apache.flex.core.ContainerBase} */
- get: function() {
- return this.actualParent_;
- },
- /** @this {org.apache.flex.core.ContainerBase} */
- set: function(s) {
- this.actualParent_ = s;
- }
- },
- /** @export */
strandChildren: {
/** @this {org.apache.flex.core.ContainerBase} */
get: function() {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84ece7b7/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
index 5642cd0..f00bb51 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/UIBase.js
@@ -291,7 +291,7 @@ org.apache.flex.core.UIBase.prototype.addedToParent = function() {
}
}
}
- if (this.getBeadByType(org.apache.flex.core.IBeadView) == null)
+ if (this.view_ == null && this.getBeadByType(org.apache.flex.core.IBeadView) == null)
{
if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) {
c = /** @type {Function} */ (org.apache.flex.core.ValuesManager.valuesImpl.
@@ -299,8 +299,10 @@ org.apache.flex.core.UIBase.prototype.addedToParent = function() {
if (c)
{
var view = new c();
- if (view)
+ if (view) {
+ this.view_ = view;
this.addBead(view);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84ece7b7/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ContainerContentArea.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
index 5549f8d..38f40f9 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
@@ -23,7 +23,7 @@ package org.apache.flex.html.supportClasses
import org.apache.flex.events.Event;
/**
- * The ContainerContentArea class implements the actualParent for
+ * The ContainerContentArea class implements the contentView for
* a Container. Container's don't always parent their children directly as
* that makes it harder to handle scrolling.
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84ece7b7/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
index 2434524..c363807 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
@@ -118,7 +118,7 @@ org.apache.flex.html.Container.prototype.runLayoutHandler =
*/
org.apache.flex.html.Container.prototype.internalChildren =
function() {
- return this.actualParent.element.children;
+ return this.element.children;
};
@@ -126,7 +126,7 @@ org.apache.flex.html.Container.prototype.internalChildren =
* @return {Array} All of the children of the container.
*/
org.apache.flex.html.Container.prototype.getChildren = function() {
- var arr = this.actualParent.element.children;
+ var arr = this.element.children;
var comparr = [];
var n = arr.length;
for (var i = 0; i < n; i++)
[48/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
fix up build so it doesn't require other swcs
Posted by ah...@apache.org.
fix up build so it doesn't require other swcs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7fe382ae
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7fe382ae
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7fe382ae
Branch: refs/heads/core_js_to_as
Commit: 7fe382aee0e74edf0aa1d8d01b8f462d7fbf35fb
Parents: 10ac8d8
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 29 07:40:41 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 29 07:40:41 2015 -0700
----------------------------------------------------------------------
frameworks/projects/Core/as/src/CoreClasses.as | 1 +
frameworks/projects/Core/compile-asjs-config.xml | 7 ++-----
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7fe382ae/frameworks/projects/Core/as/src/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/CoreClasses.as b/frameworks/projects/Core/as/src/CoreClasses.as
index ac24459..5b38de8 100644
--- a/frameworks/projects/Core/as/src/CoreClasses.as
+++ b/frameworks/projects/Core/as/src/CoreClasses.as
@@ -54,6 +54,7 @@ internal class CoreClasses
import org.apache.flex.core.IImageModel; IImageModel;
import org.apache.flex.core.ILayoutChild; ILayoutChild;
import org.apache.flex.core.ILayoutHost; ILayoutHost;
+ import org.apache.flex.core.IListPresentationModel; IListPresentationModel;
import org.apache.flex.core.IPanelModel; IPanelModel;
import org.apache.flex.core.IParent; IParent;
import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7fe382ae/frameworks/projects/Core/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-asjs-config.xml b/frameworks/projects/Core/compile-asjs-config.xml
index 364d888..ff74fb0 100644
--- a/frameworks/projects/Core/compile-asjs-config.xml
+++ b/frameworks/projects/Core/compile-asjs-config.xml
@@ -21,9 +21,9 @@
<compiler>
<accessible>false</accessible>
- <!--<external-library-path>
+ <external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- </external-library-path>-->
+ </external-library-path>
<mxml>
<children-as-data>true</children-as-data>
@@ -47,9 +47,6 @@
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../libs/Core.swc</path-element>
- <path-element>../../libs/Graphics.swc</path-element>
- <path-element>../../libs/HTML.swc</path-element>
- <path-element>../../libs/Charts.swc</path-element>
</library-path>
<source-path>
[44/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
header
Posted by ah...@apache.org.
header
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/33016bb5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/33016bb5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/33016bb5
Branch: refs/heads/core_js_to_as
Commit: 33016bb59bbdcf37e3af2f914e6df306a6fa7b22
Parents: b85f244
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 24 22:26:47 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 24 22:26:47 2015 -0700
----------------------------------------------------------------------
.../src/controllers/GAJSONInputParser.as | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33016bb5/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
index 2ff5916..c443de5 100644
--- a/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
+++ b/examples/flexjs/FlexWebsiteStatsViewer/src/controllers/GAJSONInputParser.as
@@ -1,3 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 controllers
{
import org.apache.flex.collections.parsers.JSONInputParser;
[26/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
- Adjusted the Maven artifact generation to version 0.5.0 - Added some
pom.xml files to the examples (With these it should be possible to build the
examples with Maven)
Posted by ah...@apache.org.
- Adjusted the Maven artifact generation to version 0.5.0
- Added some pom.xml files to the examples (With these it should be possible to build the examples with Maven)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/58dee53b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/58dee53b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/58dee53b
Branch: refs/heads/core_js_to_as
Commit: 58dee53bc2eb4ccd760c81fe86e25e90c7e07e2b
Parents: 8124409
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Sep 18 16:18:25 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Sep 18 16:18:25 2015 +0200
----------------------------------------------------------------------
examples/flexjs/ChartExample/pom.xml | 74 ++++++++
examples/flexjs/CordovaCameraExample/pom.xml | 74 ++++++++
examples/flexjs/DataBindingExample/pom.xml | 74 ++++++++
examples/flexjs/DataBindingExample_Flat/pom.xml | 74 ++++++++
examples/flexjs/DataBindingExample_as/pom.xml | 84 +++++++++
examples/flexjs/DataGridExample/pom.xml | 74 ++++++++
examples/flexjs/DesktopMap/pom.xml | 74 ++++++++
examples/flexjs/FlexJSStore/pom.xml | 74 ++++++++
examples/flexjs/FlexJSStore_jquery/pom.xml | 74 ++++++++
examples/flexjs/MapSearch/pom.xml | 74 ++++++++
examples/flexjs/MobileTrader/pom.xml | 74 ++++++++
examples/flexjs/TodoListSampleApp/pom.xml | 74 ++++++++
examples/flexjs/pom.xml | 178 +++++++++++++++++++
13 files changed, 1076 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/ChartExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ChartExample/pom.xml b/examples/flexjs/ChartExample/pom.xml
new file mode 100644
index 0000000..4bdc4c2
--- /dev/null
+++ b/examples/flexjs/ChartExample/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ChartExample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>ChartExample.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/CordovaCameraExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/pom.xml b/examples/flexjs/CordovaCameraExample/pom.xml
new file mode 100644
index 0000000..cd96b8d
--- /dev/null
+++ b/examples/flexjs/CordovaCameraExample/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>CordovaCameraExample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>CordovaCameraExample.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/DataBindingExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/pom.xml b/examples/flexjs/DataBindingExample/pom.xml
new file mode 100644
index 0000000..785043f
--- /dev/null
+++ b/examples/flexjs/DataBindingExample/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>DataBindingExample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>DataBindingExample.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/DataBindingExample_Flat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/pom.xml b/examples/flexjs/DataBindingExample_Flat/pom.xml
new file mode 100644
index 0000000..29888a6
--- /dev/null
+++ b/examples/flexjs/DataBindingExample_Flat/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>DataBindingExample_Flat</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>DataBindingExample.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/DataBindingExample_as/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_as/pom.xml b/examples/flexjs/DataBindingExample_as/pom.xml
new file mode 100644
index 0000000..357b169
--- /dev/null
+++ b/examples/flexjs/DataBindingExample_as/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>DataBindingExample_as</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>DataBindingExample.as</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ <defines>
+ <property>
+ <name>CONFIG::as_only</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>CONFIG::js_only</name>
+ <value>false</value>
+ </property>
+ </defines>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/DataGridExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataGridExample/pom.xml b/examples/flexjs/DataGridExample/pom.xml
new file mode 100644
index 0000000..d534c23
--- /dev/null
+++ b/examples/flexjs/DataGridExample/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>DataGridExample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>DataGridExample.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/DesktopMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/pom.xml b/examples/flexjs/DesktopMap/pom.xml
new file mode 100644
index 0000000..cb9cd7c
--- /dev/null
+++ b/examples/flexjs/DesktopMap/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>DesktopMap</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>DesktopMap.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/FlexJSStore/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/pom.xml b/examples/flexjs/FlexJSStore/pom.xml
new file mode 100644
index 0000000..1f63742
--- /dev/null
+++ b/examples/flexjs/FlexJSStore/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>FlexJSStore</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>FlexJSStore.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/FlexJSStore_jquery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/pom.xml b/examples/flexjs/FlexJSStore_jquery/pom.xml
new file mode 100644
index 0000000..f72ddc9
--- /dev/null
+++ b/examples/flexjs/FlexJSStore_jquery/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>FlexJSStore_jquery</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>FlexJSStore.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/MapSearch/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/pom.xml b/examples/flexjs/MapSearch/pom.xml
new file mode 100644
index 0000000..c449848
--- /dev/null
+++ b/examples/flexjs/MapSearch/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MapSearch</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>MapSearch.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/MobileTrader/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/pom.xml b/examples/flexjs/MobileTrader/pom.xml
new file mode 100644
index 0000000..26aee5d
--- /dev/null
+++ b/examples/flexjs/MobileTrader/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MobileTrader</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>MobileTrader.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/TodoListSampleApp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TodoListSampleApp/pom.xml b/examples/flexjs/TodoListSampleApp/pom.xml
new file mode 100644
index 0000000..2aac2a8
--- /dev/null
+++ b/examples/flexjs/TodoListSampleApp/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>TodoListSample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>TodoListSampleApp.mxml</sourceFile>
+ <compilerName>${flexmojos-compiler-name}</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>18.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58dee53b/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
new file mode 100644
index 0000000..a185d81
--- /dev/null
+++ b/examples/flexjs/pom.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- Comment this in to build Flash output -->
+ <!--flexmojos-compiler-name>Falcon</flexmojos-compiler-name-->
+ <!-- Comment this in to build HTML+JavaScript output -->
+ <flexmojos-compiler-name>FlexJS</flexmojos-compiler-name>
+ </properties>
+
+
+ <modules>
+ <module>ChartExample</module>
+ <module>CordovaCameraExample</module>
+ <module>DataBindingExample</module>
+ <module>DataBindingExample_as</module>
+ <!--
+ This tag could not be resolved to an ActionScript class. It will be ignored.
+ <js:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
+ -->
+ <!--module>DataBindingExample_Flat</module-->
+ <module>DataGridExample</module>
+ <module>DesktopMap</module>
+ <!--
+ "Ambiguous reference to MouseEvent" problem
+ -->
+ <!--module>FlexJSStore_jquery</module-->
+ <!--
+ "Ambiguous reference to MouseEvent" problem
+ -->
+ <!--module>FlexJSStore</module-->
+ <module>MapSearch</module>
+ <!--
+ Implicit coercion of a value with static type Event to a possibly unrelated type Event.
+ <basic:TabbedViewManager id="navController" width="100%" height="100%" x="0" y="0" viewChanged="tabbedViewChanged(event)">
+ -->
+ <!--module>MobileTrader</module-->
+ <module>TodoListSampleApp</module>
+ </modules>
+
+
+ <repositories>
+ <!--
+ This is where we get released stuff from.
+ -->
+ <repository>
+ <id>maven-central</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <!--
+ This is where we get unreleased Apache stuff from
+ -->
+ <repository>
+ <id>apache-snapshots</id>
+ <url>http://repository.apache.org/content/groups/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!--
+ This is where we get unreleased Flexmojos stuff from.
+ -->
+ <repository>
+ <id>sonatype-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!--
+ This is where third party dependencies for flexmojos come from.
+ -->
+ <repository>
+ <id>sonatype-flexmojos-cache</id>
+ <url>https://repository.sonatype.org/content/groups/flexgroup/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <!--
+ This is where we get released stuff from.
+ -->
+ <pluginRepository>
+ <id>maven-central</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--
+ This is where we get unreleased Apache stuff from
+ -->
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <url>http://repository.apache.org/content/groups/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--
+ This is where we get unreleased Flexmojos stuff from.
+ -->
+ <pluginRepository>
+ <id>sonatype-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--
+ This is where third party dependencies for flexmojos come from.
+ -->
+ <pluginRepository>
+ <id>sonatype-flexmojos-cache</id>
+ <url>https://repository.sonatype.org/content/groups/flexgroup/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+</project>
[08/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
quiet warnings
Posted by ah...@apache.org.
quiet warnings
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e16eeb4d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e16eeb4d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e16eeb4d
Branch: refs/heads/core_js_to_as
Commit: e16eeb4dfe2fb86bcbb8ab037dc8d6a03370e9d9
Parents: 8592a20
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:08:26 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:17 2015 -0700
----------------------------------------------------------------------
.../projects/Core/as/src/org/apache/flex/core/Application.as | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e16eeb4d/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
index 54e45f0..0d933b6 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
@@ -231,8 +231,10 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ [Bindable("__NoChangeEvent__")]
public var initialView:ViewBase;
+ [Bindable("__NoChangeEvent__")]
/**
* The data model (for the initial view).
*
@@ -241,6 +243,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ [Bindable("__NoChangeEvent__")]
public var model:Object;
/**
[19/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
get DDL to respond to outer class styles
Posted by ah...@apache.org.
get DDL to respond to outer class styles
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2fb5a501
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2fb5a501
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2fb5a501
Branch: refs/heads/core_js_to_as
Commit: 2fb5a50156534bb18576452045aafcd2b71c0d3e
Parents: 6168c17
Author: Alex Harui <ah...@apache.org>
Authored: Mon Sep 14 16:40:33 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Sep 14 16:40:33 2015 -0700
----------------------------------------------------------------------
.../js/src/org/apache/flex/flat/DropDownList.js | 23 +++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2fb5a501/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
index ef6d3f5..1916d5b 100644
--- a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
@@ -16,6 +16,7 @@ goog.provide('org.apache.flex.flat.DropDownList');
goog.require('org.apache.flex.core.ListBase');
goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.utils.Language');
@@ -52,6 +53,8 @@ org.apache.flex.flat.DropDownList.prototype.createElement =
this.button = button = document.createElement('button');
button.className = 'dropdown-toggle-open-btn';
+ if (this.className)
+ button.className += ' ' + this.className;
goog.events.listen(button, 'click', goog.bind(this.buttonClicked, this));
this.element.appendChild(button);
@@ -148,7 +151,9 @@ org.apache.flex.flat.DropDownList.prototype.buttonClicked =
*/
this.menu = select = document.createElement('ul');
- select.style.width = width.toString() + 'px';
+ var el = /** @type {Element} */ (this.element);
+ var cv = window.getComputedStyle(el);
+ select.style.width = cv.width;
goog.events.listen(select, 'click', goog.bind(this.selectChanged, this));
select.className = 'dropdown-menu';
@@ -177,6 +182,22 @@ org.apache.flex.flat.DropDownList.prototype.buttonClicked =
Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
+ /** @export */
+ className: {
+ /** @this {org.apache.flex.flat.DropDownList} */
+ get: function() {
+ return org.apache.flex.utils.Language.superGetter(org.apache.flex.flat.DropDownList, this, 'className');
+ },
+ /** @this {org.apache.flex.flat.DropDownList} */
+ set: function(value) {
+ org.apache.flex.utils.Language.superSetter(org.apache.flex.flat.DropDownList, this, 'className', value);
+ if (this.button) {
+ this.button.className = this.typeNames ?
+ value + ' ' + 'dropdown-toggle-open-btn' + ' ' + this.typeNames :
+ value + ' ' + 'dropdown-toggle-open-btn';
+ }
+ }
+ },
dataProvider: {
/** @this {org.apache.flex.flat.DropDownList} */
get: function() {
[20/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
fix dropdown list width in JS
Posted by ah...@apache.org.
fix dropdown list width in JS
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7d030904
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7d030904
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7d030904
Branch: refs/heads/core_js_to_as
Commit: 7d030904cc44adaa4e71eb0efc67dd338faa65ac
Parents: 2fb5a50
Author: Alex Harui <ah...@apache.org>
Authored: Mon Sep 14 23:36:58 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Sep 14 23:36:58 2015 -0700
----------------------------------------------------------------------
frameworks/projects/Flat/as/defaults.css | 8 ++++
.../js/src/org/apache/flex/flat/DropDownList.js | 43 +++++++++++++++++---
2 files changed, 45 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d030904/frameworks/projects/Flat/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/defaults.css b/frameworks/projects/Flat/as/defaults.css
index 213f31f..32ca37d 100644
--- a/frameworks/projects/Flat/as/defaults.css
+++ b/frameworks/projects/Flat/as/defaults.css
@@ -291,6 +291,14 @@ DateField {
transition: border-color .25s, color .25s;
}
+.dropdown-label {
+ color: inherit;
+ background-color: inherit;
+ font: inherit;
+ text-align: left;
+ display: inline-block;
+ }
+
HContainer
{
IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d030904/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
index 1916d5b..9b242d8 100644
--- a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
@@ -16,6 +16,7 @@ goog.provide('org.apache.flex.flat.DropDownList');
goog.require('org.apache.flex.core.ListBase');
goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.utils.CSSUtils');
goog.require('org.apache.flex.utils.Language');
@@ -47,7 +48,7 @@ org.apache.flex.flat.DropDownList.prototype.FLEXJS_CLASS_INFO =
*/
org.apache.flex.flat.DropDownList.prototype.createElement =
function() {
- var button, input;
+ var button, caret;
this.element = document.createElement('div');
@@ -58,7 +59,11 @@ org.apache.flex.flat.DropDownList.prototype.createElement =
goog.events.listen(button, 'click', goog.bind(this.buttonClicked, this));
this.element.appendChild(button);
- var caret = document.createElement('span');
+ this.label = document.createElement('span');
+ this.label.className = 'dropdown-label';
+ button.appendChild(this.label);
+ this.caret = caret = document.createElement('span');
+ button.appendChild(caret);
caret.className = 'dropdown-caret';
this.positioner = this.element;
@@ -71,6 +76,7 @@ org.apache.flex.flat.DropDownList.prototype.createElement =
button.flexjs_wrapper = this;
this.element.flexjs_wrapper = this;
+ this.label.flexjs_wrapper = this;
caret.flexjs_wrapper = this;
return this.element;
@@ -181,6 +187,31 @@ org.apache.flex.flat.DropDownList.prototype.buttonClicked =
};
+/**
+ * @override
+ */
+org.apache.flex.flat.DropDownList.prototype.addedToParent = function() {
+ org.apache.flex.flat.DropDownList.base(this, 'addedToParent');
+ var el = /** @type {Element} */ (this.button);
+ var cv = window.getComputedStyle(el);
+ var s = /** @type {string} */ (cv.paddingLeft);
+ var pl = org.apache.flex.utils.CSSUtils.toNumber(s);
+ s = /** @type {string} */ (cv.paddingRight);
+ var pr = org.apache.flex.utils.CSSUtils.toNumber(s);
+ s = /** @type {string} */ (cv.borderLeftWidth);
+ var bl = org.apache.flex.utils.CSSUtils.toNumber(s);
+ s = /** @type {string} */ (cv.borderRightWidth);
+ var br = org.apache.flex.utils.CSSUtils.toNumber(s);
+ var caretWidth = this.caret.offsetWidth;
+ // is 4 for spacing between spans?
+ var fluff = pl + pr + bl + br + caretWidth + 1 + 4;
+ var labelWidth = this.width - fluff;
+ var strWidth = labelWidth.toString();
+ strWidth += 'px';
+ this.label.style.width = strWidth;
+};
+
+
Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
/** @export */
className: {
@@ -238,9 +269,9 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
this.model.selectedIndex = value;
var lf = this.labelField;
if (lf)
- this.button.innerHTML = this.selectedItem[lf] + '<span class="dropdown-caret"/>';
+ this.label.innerHTML = this.selectedItem[lf];
else
- this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+ this.label.innerHTML = this.selectedItem;
}
},
/** @export */
@@ -257,9 +288,9 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
this.model.selectedItem = value;
var lf = this.labelField;
if (lf)
- this.button.innerHTML = this.selectedItem[lf] + '<span class="dropdown-caret"/>';
+ this.label.innerHTML = this.selectedItem[lf];
else
- this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+ this.label.innerHTML = this.selectedItem;
}
}
});
[42/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
fix up containers after last refactor
Posted by ah...@apache.org.
fix up containers after last refactor
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/72c84c8d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/72c84c8d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/72c84c8d
Branch: refs/heads/core_js_to_as
Commit: 72c84c8d32ebf3f82223911584da4ab3856f55c4
Parents: d07030f
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 24 16:37:25 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 24 16:37:25 2015 -0700
----------------------------------------------------------------------
.../src/org/apache/flex/core/ContainerBase.as | 38 ++++----------------
.../as/src/org/apache/flex/core/IContainer.as | 11 ------
.../src/org/apache/flex/core/ContainerBase.js | 12 +++----
.../js/src/org/apache/flex/core/IContainer.js | 6 ----
.../html/beads/ControlBarMeasurementBead.as | 6 ++--
.../html/beads/layouts/VerticalColumnLayout.as | 7 ++--
.../js/src/org/apache/flex/html/Container.js | 15 --------
7 files changed, 18 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c84c8d/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
index 050f018..a847b01 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
@@ -122,11 +122,11 @@ package org.apache.flex.core
var contentView:IParent = view as IParent;
if (contentView != null) {
contentView.addElement(c, dispatchEvent);
+ if (dispatchEvent)
+ this.dispatchEvent(new Event("childrenAdded"));
}
else {
addChild(c as DisplayObject);
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenAdded"));
}
}
@@ -138,11 +138,11 @@ package org.apache.flex.core
var contentView:IParent = view as IParent;
if (contentView != null) {
contentView.addElementAt(c, index, dispatchEvent);
+ if (dispatchEvent)
+ this.dispatchEvent(new Event("childrenAdded"));
}
else {
addChildAt(c as DisplayObject, index);
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenAdded"));
}
}
@@ -154,41 +154,15 @@ package org.apache.flex.core
var contentView:IParent = view as IParent;
if (contentView != null) {
contentView.removeElement(c, dispatchEvent);
+ if (dispatchEvent)
+ this.dispatchEvent(new Event("childrenRemoved"));
}
else {
removeChild(c as DisplayObject);
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenRemoved"));
}
}
/**
- * Get the array of children. To change the children use
- * addElement, removeElement.
- */
- public function getChildren():Array
- {
- var contentView:IParent = view as IParent;
- var children:Array = [];
- var n:int = 0;
- var i:int = 0;
-
- if (contentView != null) {
- n = contentView.numElements;
- for (i=0; i < n; i++) {
- children.push(contentView.getElementAt(i));
- }
- }
- else {
- for (i = 0; i < n; i++) {
- children.push(getChildAt(i));
- }
- }
-
- return children;
- }
-
- /**
* @private
*/
public function childrenAdded():void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c84c8d/frameworks/projects/Core/as/src/org/apache/flex/core/IContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IContainer.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IContainer.as
index 1091bad..889a888 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IContainer.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IContainer.as
@@ -32,17 +32,6 @@ package org.apache.flex.core
*/
public interface IContainer extends IParent
{
- /**
- * This method returns an array of the content children
- * of the container.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function getChildren():Array;
-
/**
* This method is called after children have been
* added to the container so the container doesn't
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c84c8d/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
index 1441721..4d409e4 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ContainerBase.js
@@ -159,6 +159,8 @@ org.apache.flex.core.ContainerBase.prototype.addElement = function(c, opt_dispat
var contentView = this.view;
if (contentView != null) {
contentView.addElement(c, opt_dispatchEvent);
+ if (opt_dispatchEvent)
+ this.dispatchEvent('childrenAdded');
}
else {
this.$addElement(c, opt_dispatchEvent);
@@ -179,6 +181,8 @@ org.apache.flex.core.ContainerBase.prototype.addElementAt = function(c, index, o
var contentView = this.view;
if (contentView != null) {
contentView.addElementAt(c, index, opt_dispatchEvent);
+ if (opt_dispatchEvent)
+ this.dispatchEvent('childrenAdded');
}
else {
this.$addElementAt(c, index, opt_dispatchEvent);
@@ -208,6 +212,8 @@ org.apache.flex.core.ContainerBase.prototype.removeElement = function(c, opt_dis
var contentView = this.view;
if (contentView != null) {
contentView.removeElement(c, opt_dispatchEvent);
+ if (opt_dispatchEvent)
+ this.dispatchEvent('childrenRemoved');
} else {
this.$removeElement(c, opt_dispatchEvent);
}
@@ -246,8 +252,6 @@ org.apache.flex.core.ContainerBase.prototype.$addElement = function(c, opt_dispa
opt_dispatchEvent = true;
this.element.appendChild(c.positioner);
c.addedToParent();
- if (opt_dispatchEvent)
- this.dispatchEvent('childrenAdded');
};
@@ -268,8 +272,6 @@ org.apache.flex.core.ContainerBase.prototype.$addElementAt = function(c, index,
children1[index]);
c.addedToParent();
}
- if (opt_dispatchEvent)
- this.dispatchEvent('childrenAdded');
};
@@ -280,8 +282,6 @@ org.apache.flex.core.ContainerBase.prototype.$addElementAt = function(c, index,
*/
org.apache.flex.core.ContainerBase.prototype.$removeElement = function(c, opt_dispatchEvent) {
this.element.removeChild(c.element);
- if (opt_dispatchEvent)
- this.dispatchEvent('childrenRemoved');
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c84c8d/frameworks/projects/Core/js/src/org/apache/flex/core/IContainer.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/IContainer.js b/frameworks/projects/Core/js/src/org/apache/flex/core/IContainer.js
index 50cfcc7..6df12dc 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/IContainer.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/IContainer.js
@@ -35,12 +35,6 @@ org.apache.flex.core.IContainer = function() {
/**
- * @return {Array} All of the children of the container.
- */
-org.apache.flex.core.IContainer.prototype.getChildren = function() {};
-
-
-/**
* Called after all of the children have been added to the container.
* @return {void}
*/
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c84c8d/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
index 97b24b5..18d19dd 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
@@ -62,10 +62,10 @@ package org.apache.flex.html.beads
// since it would know the arrangement of the items and how far apart they are and if
// there are margins and paddings and gaps involved.
var mwidth:Number = 0;
- var children:Array = Container(_strand).getChildren();
- var n:int = children.length;
+ var container:Container = Container(_strand);
+ var n:int = container.numElements;
for(var i:int=0; i < n; i++) {
- var child:IUIBase = children[i] as IUIBase;
+ var child:IUIBase = container.getElementAt(i) as IUIBase;
if( child == null ) continue;
var childMeasure:IMeasurementBead = child.getBeadByType(IMeasurementBead) as IMeasurementBead;
if (childMeasure)
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c84c8d/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
index 885eb80..d32777d 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
@@ -124,13 +124,12 @@ package org.apache.flex.html.beads.layouts
var mr:Number;
var mt:Number;
var mb:Number;
- var children:Array = IContainer(_strand).getChildren();
- var n:int = children.length;
+ var n:int = contentView.numElements;
var rowData:Object = { rowHeight: 0 };
// determine max widths of columns
for (i = 0; i < n; i++) {
- e = children[i];
+ e = contentView.getElementAt(i) as IUIBase;
margin = ValuesManager.valuesImpl.getValue(e, "margin");
marginLeft = ValuesManager.valuesImpl.getValue(e, "margin-left");
marginTop = ValuesManager.valuesImpl.getValue(e, "margin-top");
@@ -172,7 +171,7 @@ package org.apache.flex.html.beads.layouts
col = 0;
for (i = 0; i < n; i++)
{
- e = children[i];
+ e = contentView.getElementAt(i) as IUIBase;
e.x = curx + ml;
e.y = cury + data[i].mt;
curx += columns[col++];
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c84c8d/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
index c363807..b7d628a 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/Container.js
@@ -121,18 +121,3 @@ org.apache.flex.html.Container.prototype.internalChildren =
return this.element.children;
};
-
-/**
- * @return {Array} All of the children of the container.
- */
-org.apache.flex.html.Container.prototype.getChildren = function() {
- var arr = this.element.children;
- var comparr = [];
- var n = arr.length;
- for (var i = 0; i < n; i++)
- {
- comparr.push(arr[i].flexjs_wrapper);
- }
- return comparr;
-};
-
[49/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
ported enough to replace many handwritten js classes in Core and get
DataBindingExample to mostly work
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/basic-manifest.xml b/frameworks/projects/Core/basic-manifest.xml
index 6eb5ae0..69dab36 100644
--- a/frameworks/projects/Core/basic-manifest.xml
+++ b/frameworks/projects/Core/basic-manifest.xml
@@ -22,22 +22,22 @@
<componentPackage>
<component id="Application" class="org.apache.flex.core.Application"/>
+ <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
+ <component id="CSSFontFaceBead" class="org.apache.flex.core.CSSFontFaceBead" />
+ <component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
<!-- temporarily remove these classes while we try to get Application to compile
<component id="BrowserScroller" class="org.apache.flex.core.BrowserScroller"/>
<component id="BrowserResizeHandler" class="org.apache.flex.core.BrowserResizeListener"/>
<component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/>
- <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
- <component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
<component id="MXMLDragInitiator" class="org.apache.flex.core.MXMLDragInitiator" />
<component id="CallLaterBead" class="org.apache.flex.core.CallLaterBead" />
- <component id="CSSFontFaceBead" class="org.apache.flex.core.CSSFontFaceBead" />
<component id="BindableCSSStyles" class="org.apache.flex.core.BindableCSSStyles"/>
<component id="SimpleCSSStyles" class="org.apache.flex.core.SimpleCSSStyles"/>
<component id="ParentDocumentBead" class="org.apache.flex.core.ParentDocumentBead"/>
<component id="MixinManager" class="org.apache.flex.utils.MixinManager" />
+ -->
<component id="ViewSourceContextMenuOption" class="org.apache.flex.utils.ViewSourceContextMenuOption" />
<component id="State" class="org.apache.flex.states.State"/>
- -->
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index d32f0f0..77fa48d 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -174,8 +174,6 @@
<target name="compile-as-for-js" >
<!-- copy js.swc into frameworks/libs -->
- <copy file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" todir="${basedir}/../../libs" />
- <copy file="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" todir="${basedir}/../../libs" />
<echo message="Cross-compiling Core/as for js"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
@@ -191,6 +189,9 @@
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+ <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <!-- this is not on external-library path otherwise goog.requires are not generated -->
+ <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<arg value="-define=COMPILE::AS3,false" />
<arg value="-define=COMPILE::JS,true" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-config.xml b/frameworks/projects/Core/compile-config.xml
index 7ad8c2c..51d36de 100644
--- a/frameworks/projects/Core/compile-config.xml
+++ b/frameworks/projects/Core/compile-config.xml
@@ -63,10 +63,12 @@
<name>js/out/*</name>
<path>js/out/*</path>
</include-file>
+ <!--
<include-file>
<name>js/src/*</name>
<path>js/src/*</path>
</include-file>
+ -->
<include-classes>
<class>CoreClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-js-config.xml b/frameworks/projects/Core/compile-js-config.xml
index 061dd2d..3c3784b 100644
--- a/frameworks/projects/Core/compile-js-config.xml
+++ b/frameworks/projects/Core/compile-js-config.xml
@@ -23,8 +23,6 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../libs/js.swc</path-element>
- <path-element>../../libs/GCL.swc</path-element>
</external-library-path>
<mxml>
@@ -65,11 +63,13 @@
<name>js/out/*</name>
<path>js/out/*</path>
</include-file>
+ <!--
<include-file>
<name>js/src/*</name>
<path>js/src/*</path>
</include-file>
-
+ -->
+
<include-classes>
<class>CoreJSClasses</class>
<!-- leave out for now until we get Application to compile
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
index 2fb57a9..3b060df 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
@@ -139,5 +139,4 @@ Object.defineProperties(org.apache.flex.html.DropDownList.prototype, {
org.apache.flex.html.DropDownList.prototype.changeHandler =
function() {
this.model.selectedIndex = this.element.selectedIndex;
- this.dispatchEvent('change');
};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
index db88a86..39158f6 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
@@ -16,6 +16,7 @@ goog.provide('org.apache.flex.html.beads.ContainerView');
goog.require('org.apache.flex.core.BeadViewBase');
goog.require('org.apache.flex.core.IBeadLayout');
+goog.require('org.apache.flex.core.IContainerView');
goog.require('org.apache.flex.core.ILayoutHost');
goog.require('org.apache.flex.core.IViewport');
goog.require('org.apache.flex.core.IViewportModel');
@@ -49,7 +50,7 @@ goog.inherits(
org.apache.flex.html.beads.ContainerView.prototype.FLEXJS_CLASS_INFO =
{ names: [{ name: 'ContainerView',
qName: 'org.apache.flex.html.beads.ContainerView' }],
- interfaces: [org.apache.flex.core.ILayoutHost]
+ interfaces: [org.apache.flex.core.ILayoutHost, org.apache.flex.core.IContainerView]
};
[25/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Added the "flat" artifact to the maven deployment.
Posted by ah...@apache.org.
Added the "flat" artifact to the maven deployment.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8124409d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8124409d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8124409d
Branch: refs/heads/core_js_to_as
Commit: 8124409d65922de7c9a51ac3be8b6ce9051a1902
Parents: 0f2bf88
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Sep 18 11:55:37 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Sep 18 11:55:37 2015 +0200
----------------------------------------------------------------------
maven.xml | 15 +++++++++++++++
maven/flexjs-framework.pom | 6 ++++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8124409d/maven.xml
----------------------------------------------------------------------
diff --git a/maven.xml b/maven.xml
index 469c929..4f8d48a 100644
--- a/maven.xml
+++ b/maven.xml
@@ -91,6 +91,12 @@
</antcall>
<antcall target="-pack-maven-artifact">
+ <param name="moduleName" value="Flat"/>
+ <param name="artifactName" value="flat"/>
+ <param name="fileName" value="frameworks/libs/Flat.swc"/>
+ </antcall>
+
+ <antcall target="-pack-maven-artifact">
<param name="moduleName" value="Formatters"/>
<param name="artifactName" value="formatters"/>
<param name="fileName" value="frameworks/libs/Formatters.swc"/>
@@ -194,6 +200,11 @@
</antcall>
<antcall target="-install-maven-artifact-file-with-sources">
+ <param name="artifactName" value="flat"/>
+ <param name="artifactExtension" value="swc"/>
+ </antcall>
+
+ <antcall target="-install-maven-artifact-file-with-sources">
<param name="artifactName" value="formatters"/>
<param name="artifactExtension" value="swc"/>
</antcall>
@@ -270,6 +281,10 @@
</antcall>
<antcall target="-deploy-maven-artifact-file-with-sources">
+ <param name="artifactName" value="flat"/>
+ </antcall>
+
+ <antcall target="-deploy-maven-artifact-file-with-sources">
<param name="artifactName" value="formatters"/>
</antcall>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8124409d/maven/flexjs-framework.pom
----------------------------------------------------------------------
diff --git a/maven/flexjs-framework.pom b/maven/flexjs-framework.pom
index 86941cf..970e3e6 100644
--- a/maven/flexjs-framework.pom
+++ b/maven/flexjs-framework.pom
@@ -78,6 +78,12 @@
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flat</artifactId>
+ <version>@VERSION@</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>formatters</artifactId>
<version>@VERSION@</version>
<type>swc</type>
[09/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
labelfield in dropdownlist
Posted by ah...@apache.org.
labelfield in dropdownlist
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b5a5a4eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b5a5a4eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b5a5a4eb
Branch: refs/heads/core_js_to_as
Commit: b5a5a4eb89e7de72c3c92fb03dcf634dca2ca1be
Parents: 00f22de
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:11:54 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:18 2015 -0700
----------------------------------------------------------------------
.../apache/flex/flat/beads/DropDownListView.as | 10 ++++--
.../js/src/org/apache/flex/flat/DropDownList.js | 32 ++++++++++++++++++--
.../as/src/org/apache/flex/html/DropDownList.as | 18 +++++++++++
.../apache/flex/html/beads/DropDownListView.as | 8 ++++-
.../TextItemRendererFactoryForArrayData.as | 5 ++-
.../beads/controllers/DropDownListController.as | 1 +
.../html/beads/models/ArraySelectionModel.as | 4 ++-
.../js/src/org/apache/flex/html/DropDownList.js | 22 ++++++++++++--
.../html/beads/models/ArraySelectionModel.js | 2 ++
9 files changed, 92 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as b/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
index 3d7d838..f7357b9 100644
--- a/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
+++ b/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
@@ -126,6 +126,7 @@ package org.apache.flex.flat.beads
super.strand = value;;
selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
+ selectionModel.addEventListener("dataProviderChanged", selectionChangeHandler);
shape = new Shape();
shape.graphics.beginFill(0xCCCCCC);
shape.graphics.drawRect(0, 0, 10, 10);
@@ -135,7 +136,7 @@ package org.apache.flex.flat.beads
SimpleButton(value).overState = overSprite;
SimpleButton(value).hitTestState = shape;
if (selectionModel.selectedIndex !== -1)
- text = selectionModel.selectedItem.toString();
+ selectionChangeHandler(null);
else
text = "^W_";
upTextField.height = upTextField.textHeight + 4;
@@ -151,7 +152,12 @@ package org.apache.flex.flat.beads
private function selectionChangeHandler(event:Event):void
{
- text = selectionModel.selectedItem.toString();
+ if (selectionModel.selectedItem == null)
+ text = "";
+ else if (selectionModel.labelField != null)
+ text = selectionModel.selectedItem[selectionModel.labelField].toString();
+ else
+ text = selectionModel.selectedItem.toString();
}
private function changeHandler(event:Event):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
index 9f7614c..ef6d3f5 100644
--- a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
@@ -152,13 +152,17 @@ org.apache.flex.flat.DropDownList.prototype.buttonClicked =
goog.events.listen(select, 'click', goog.bind(this.selectChanged, this));
select.className = 'dropdown-menu';
+ var lf = this.labelField;
dp = /** @type {Array.<string>} */ (this.dataProvider);
n = dp.length;
for (i = 0; i < n; i++) {
opt = document.createElement('li');
opt.style.backgroundColor = 'transparent';
var ir = document.createElement('a');
- ir.innerHTML = dp[i];
+ if (lf)
+ ir.innerHTML = dp[i][lf];
+ else
+ ir.innerHTML = dp[i];
ir.id = i.toString();
if (i == this.selectedIndex)
ir.className = 'dropdown-menu-item-renderer-selected';
@@ -186,6 +190,20 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
}
},
/** @export */
+ labelField: {
+ // TODO: (aharui) copied from ListBase because you
+ // can't just override the setter in a defineProps
+ // structure.
+ /** @this {org.apache.flex.flat.DropDownList} */
+ get: function() {
+ return this.model.labelField;
+ },
+ /** @this {org.apache.flex.flat.DropDownList} */
+ set: function(value) {
+ this.model.labelField = value;
+ }
+ },
+ /** @export */
selectedIndex: {
// TODO: (aharui) copied from ListBase because you
// can't just override the setter in a defineProps
@@ -197,7 +215,11 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
/** @this {org.apache.flex.flat.DropDownList} */
set: function(value) {
this.model.selectedIndex = value;
- this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+ var lf = this.labelField;
+ if (lf)
+ this.button.innerHTML = this.selectedItem[lf] + '<span class="dropdown-caret"/>';
+ else
+ this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
}
},
/** @export */
@@ -212,7 +234,11 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
/** @this {org.apache.flex.flat.DropDownList} */
set: function(value) {
this.model.selectedItem = value;
- this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+ var lf = this.labelField;
+ if (lf)
+ this.button.innerHTML = this.selectedItem[lf] + '<span class="dropdown-caret"/>';
+ else
+ this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
}
}
});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
index 43b34ea..25dcfc7 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
@@ -135,5 +135,23 @@ package org.apache.flex.html
ISelectionModel(model).selectedItem = value;
}
+ /**
+ * The name of field within the data used for display. Each item of the
+ * data should have a property with this name.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get labelField():String
+ {
+ return ISelectionModel(model).labelField;
+ }
+ public function set labelField(value:String):void
+ {
+ ISelectionModel(model).labelField = value;
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
index e3f1a7e..1334227 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
@@ -114,6 +114,7 @@ package org.apache.flex.html.beads
super.strand = value;;
selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
+ selectionModel.addEventListener("dataProviderChanged", selectionChangeHandler);
shape = new Shape();
shape.graphics.beginFill(0xCCCCCC);
shape.graphics.drawRect(0, 0, 10, 10);
@@ -139,7 +140,12 @@ package org.apache.flex.html.beads
private function selectionChangeHandler(event:Event):void
{
- text = selectionModel.selectedItem.toString();
+ if (selectionModel.selectedItem == null)
+ text = "";
+ else if (selectionModel.labelField != null)
+ text = selectionModel.selectedItem[selectionModel.labelField].toString();
+ else
+ text = selectionModel.selectedItem.toString();
}
private function changeHandler(event:Event):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
index 635b851..f500094 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
@@ -131,7 +131,10 @@ package org.apache.flex.html.beads
var tf:ITextItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ITextItemRenderer;
tf.index = i;
dataGroup.addElement(tf);
- tf.text = dp[i];
+ if (selectionModel.labelField)
+ tf.text = dp[i][selectionModel.labelField];
+ else
+ tf.text = dp[i];
}
IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
index 848eda5..17a4b64 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
@@ -81,6 +81,7 @@ package org.apache.flex.html.beads.controllers
var popUpModel:ISelectionModel = UIBase(viewBead.popUp).model as ISelectionModel;
DisplayObject(viewBead.popUp).width = DisplayObject(_strand).width;
popUpModel.dataProvider = selectionModel.dataProvider;
+ popUpModel.labelField = selectionModel.labelField;
viewBead.popUpVisible = true; // adds to display list as well
popUpModel.selectedIndex = selectionModel.selectedIndex;
var pt:Point = new Point(DisplayObject(_strand).x, DisplayObject(_strand).y + DisplayObject(_strand).height);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
index 2e655a4..a6c0a31 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
@@ -85,10 +85,12 @@ package org.apache.flex.html.beads.models
*/
public function set dataProvider(value:Object):void
{
+ if (value === _dataProvider) return;
+
_dataProvider = value;
if (_selectedIndex != -1)
_selectedItem = (_dataProvider == null || _selectedIndex >= _dataProvider.length) ? null :
- _dataProvider[value];
+ _dataProvider[_selectedIndex];
dispatchEvent(new Event("dataProviderChanged"));
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
index 1630d3a..2fb57a9 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
@@ -74,15 +74,33 @@ Object.defineProperties(org.apache.flex.html.DropDownList.prototype, {
dp.remove(0);
}
+ var lf = this.labelField;
n = value.length;
for (i = 0; i < n; i++) {
opt = document.createElement('option');
- opt.text = value[i];
+ if (lf)
+ opt.text = value[i][lf];
+ else
+ opt.text = value[i];
dp.add(opt);
}
}
},
/** @export */
+ labelField: {
+ // TODO: (aharui) copied from ListBase because you
+ // can't just override the setter in a defineProps
+ // structure.
+ /** @this {org.apache.flex.html.DropDownList} */
+ get: function() {
+ return this.model.labelField;
+ },
+ /** @this {org.apache.flex.html.DropDownList} */
+ set: function(value) {
+ this.model.labelField = value;
+ }
+ },
+ /** @export */
selectedIndex: {
// TODO: (aharui) copied from ListBase because you
// can't just override the setter in a defineProps
@@ -109,7 +127,7 @@ Object.defineProperties(org.apache.flex.html.DropDownList.prototype, {
/** @this {org.apache.flex.html.DropDownList} */
set: function(value) {
this.model.selectedItem = value;
- this.element.selectedIndex = this.selectedIndex;
+ this.element.selectedIndex = this.model.selectedIndex;
}
}
});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
index 1b211ce..b22cf27 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
@@ -61,6 +61,7 @@ Object.defineProperties(org.apache.flex.html.beads.models.ArraySelectionModel.pr
},
/** @this {org.apache.flex.html.beads.models.ArraySelectionModel} */
set: function(value) {
+ if (value === this.dataProvider_) return;
this.dataProvider_ = value;
this.dispatchEvent('dataProviderChanged');
}
@@ -73,6 +74,7 @@ Object.defineProperties(org.apache.flex.html.beads.models.ArraySelectionModel.pr
},
/** @this {org.apache.flex.html.beads.models.ArraySelectionModel} */
set: function(value) {
+ if (value === this.selectedIndex_) return;
this.selectedIndex_ = value;
this.dispatchEvent('selectedIndexChanged');
}
[02/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
replace fx in logos
Posted by ah...@apache.org.
replace fx in logos
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9e5abdf5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9e5abdf5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9e5abdf5
Branch: refs/heads/core_js_to_as
Commit: 9e5abdf50f5fe5c1498e01329d621cc85e218228
Parents: 9eade69
Author: Alex Harui <ah...@apache.org>
Authored: Wed Sep 9 23:03:23 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Sep 9 23:03:23 2015 -0700
----------------------------------------------------------------------
.../flexjs/FlexJSStore/src/assets/logo_blue.png | Bin 33427 -> 33677 bytes
.../FlexJSStore/src/assets/logo_orange.png | Bin 33897 -> 34199 bytes
.../FlexJSStore_jquery/src/assets/logo_blue.png | Bin 33427 -> 33677 bytes
.../src/assets/logo_orange.png | Bin 33897 -> 34199 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e5abdf5/examples/flexjs/FlexJSStore/src/assets/logo_blue.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/assets/logo_blue.png b/examples/flexjs/FlexJSStore/src/assets/logo_blue.png
index 132b894..85bad70 100755
Binary files a/examples/flexjs/FlexJSStore/src/assets/logo_blue.png and b/examples/flexjs/FlexJSStore/src/assets/logo_blue.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e5abdf5/examples/flexjs/FlexJSStore/src/assets/logo_orange.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/assets/logo_orange.png b/examples/flexjs/FlexJSStore/src/assets/logo_orange.png
index c776c8c..e3ff7a6 100755
Binary files a/examples/flexjs/FlexJSStore/src/assets/logo_orange.png and b/examples/flexjs/FlexJSStore/src/assets/logo_orange.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e5abdf5/examples/flexjs/FlexJSStore_jquery/src/assets/logo_blue.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/assets/logo_blue.png b/examples/flexjs/FlexJSStore_jquery/src/assets/logo_blue.png
index 132b894..85bad70 100755
Binary files a/examples/flexjs/FlexJSStore_jquery/src/assets/logo_blue.png and b/examples/flexjs/FlexJSStore_jquery/src/assets/logo_blue.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e5abdf5/examples/flexjs/FlexJSStore_jquery/src/assets/logo_orange.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/assets/logo_orange.png b/examples/flexjs/FlexJSStore_jquery/src/assets/logo_orange.png
index c776c8c..e3ff7a6 100755
Binary files a/examples/flexjs/FlexJSStore_jquery/src/assets/logo_orange.png and b/examples/flexjs/FlexJSStore_jquery/src/assets/logo_orange.png differ
[27/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] -
Fairly big change to the Container structure: removed the "chrome" concept in
favor of letting "advanced" components have access to the strand-as-parent.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
index f7bf57d..5bd1159 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
@@ -21,7 +21,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IItemRendererClassFactory;
import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.ISelectableItemRenderer;
import org.apache.flex.core.ISelectionModel;
@@ -100,7 +100,7 @@ package org.apache.flex.html.beads.layouts
*/
public function layout():Boolean
{
- var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = _strand.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var itemRendererParent:IItemRendererParent = contentView as IItemRendererParent;
var viewportModel:IViewportModel = (layoutParent as ButtonBarView).viewportModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
index 58ed8f6..bd5de61 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
@@ -21,7 +21,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IBeadModel;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -82,7 +82,7 @@ package org.apache.flex.html.beads.layouts
public function layout():Boolean
{
//trace(DOMPathUtil.getPath(host), event ? event.type : "fixed size");
- var layoutParent:ILayoutParent = host.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView;
var padding:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/TileLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/TileLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/TileLayout.as
index 87a4cc0..5b51149 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/TileLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/TileLayout.as
@@ -19,7 +19,7 @@
package org.apache.flex.html.beads.layouts
{
import org.apache.flex.core.IBeadLayout;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.UIBase;
@@ -132,7 +132,7 @@ package org.apache.flex.html.beads.layouts
{
// this is where the layout is calculated
var host:UIBase = _strand as UIBase;
- var p:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+ var p:ILayoutHost = _strand.getBeadByType(ILayoutHost) as ILayoutHost;
var area:UIBase = p.contentView as UIBase;
var xpos:Number = 0;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
index 675a586..7b432e7 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
@@ -21,7 +21,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IBeadModel;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -78,7 +78,7 @@ package org.apache.flex.html.beads.layouts
public function layout():Boolean
{
- var layoutParent:ILayoutParent = host.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent ? layoutParent.contentView : IParentIUIBase(host);
var padding:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ScrollingViewport.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ScrollingViewport.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ScrollingViewport.as
index 8c8fb76..2de82b1 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ScrollingViewport.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/ScrollingViewport.as
@@ -23,6 +23,7 @@ package org.apache.flex.html.supportClasses
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IContentViewHost;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.IViewport;
@@ -112,14 +113,14 @@ package org.apache.flex.html.supportClasses
{
if (_verticalScroller == null) {
_verticalScroller = createVerticalScrollBar();
- host.addElement(_verticalScroller, false);
+ (host as IContentViewHost).strandChildren.addElement(_verticalScroller);
}
}
if (needH)
{
if (_horizontalScroller == null) {
_horizontalScroller = createHorizontalScrollBar();
- host.addElement(_horizontalScroller, false);
+ (host as IContentViewHost).strandChildren.addElement(_horizontalScroller);
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/asjs/src/org/apache/flex/html/MXMLBeadViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/MXMLBeadViewBase.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/MXMLBeadViewBase.as
index 4d86573..4f871a2 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/MXMLBeadViewBase.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/MXMLBeadViewBase.as
@@ -21,7 +21,7 @@ package org.apache.flex.html
import org.apache.flex.states.State;
import org.apache.flex.core.IBead;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParent;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
@@ -44,7 +44,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class MXMLBeadViewBase extends ContainerView implements IStrand, ILayoutParent
+ public class MXMLBeadViewBase extends ContainerView implements IStrand, ILayoutHost
{
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
index 5885678..4198fea 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
@@ -20,7 +20,7 @@ package org.apache.flex.html.beads.layouts
{
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -130,7 +130,7 @@ package org.apache.flex.html.beads.layouts
*/
public function layout():Boolean
{
- var layoutParent:ILayoutParent = host.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var padding:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
var hostSizedToContent:Boolean = host.isHeightSizedToContent();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
index 401e417..309ef3b 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
@@ -21,7 +21,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IDocument;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -148,7 +148,7 @@ package org.apache.flex.html.beads.layouts
*/
public function layout():Boolean
{
- var layoutParent:ILayoutParent = host.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent ? layoutParent.contentView : IParentIUIBase(host);
var padding:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
actualChild = document[flexibleChild];
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
index e06df50..77af305 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
@@ -21,7 +21,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IDocument;
import org.apache.flex.core.ILayoutChild;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -147,7 +147,7 @@ package org.apache.flex.html.beads.layouts
*/
public function layout():Boolean
{
- var layoutParent:ILayoutParent = host.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParentIUIBase = layoutParent ? layoutParent.contentView : IParentIUIBase(host);
var padding:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
actualChild = document[flexibleChild];
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
index 122f9b3..885eb80 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
@@ -20,7 +20,7 @@ package org.apache.flex.html.beads.layouts
{
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IContainer;
- import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IMeasurementBead;
import org.apache.flex.core.IParent;
import org.apache.flex.core.IStrand;
@@ -98,7 +98,7 @@ package org.apache.flex.html.beads.layouts
public function layout():Boolean
{
var host:UIBase = UIBase(_strand);
- var layoutParent:ILayoutParent = host.getBeadByType(ILayoutParent) as ILayoutParent;
+ var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost) as ILayoutHost;
var contentView:IParent = layoutParent.contentView;
var padding:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
var sw:Number = host.width;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/basic-manifest.xml b/frameworks/projects/HTML/basic-manifest.xml
index acfdaa2..b2f6a19 100644
--- a/frameworks/projects/HTML/basic-manifest.xml
+++ b/frameworks/projects/HTML/basic-manifest.xml
@@ -54,7 +54,7 @@
<component id="HorizontalLayout" class="org.apache.flex.html.beads.layouts.HorizontalLayout"/>
<component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/>
<component id="ListView" class="org.apache.flex.html.beads.ListView"/>
- <component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState"/>
+ <!-- component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState"/ -->
<component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView"/>
<component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/List.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/List.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/List.js
index e214ebf..7c44d8a 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/List.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/List.js
@@ -21,6 +21,7 @@ goog.require('org.apache.flex.core.IListPresentationModel');
goog.require('org.apache.flex.core.ItemRendererClassFactory');
goog.require('org.apache.flex.core.ListBase');
goog.require('org.apache.flex.core.ValuesManager');
+goog.require('org.apache.flex.events.Event');
goog.require('org.apache.flex.html.beads.ListView');
goog.require('org.apache.flex.html.beads.TextItemRendererFactoryForArrayData');
goog.require('org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController');
@@ -143,6 +144,8 @@ org.apache.flex.html.List.prototype.addedToParent =
itemRendererFactory = new m2();
this.addBead(itemRendererFactory);
}
+
+ this.dispatchEvent(new org.apache.flex.events.Event('initComplete'));
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/NumericStepper.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/NumericStepper.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/NumericStepper.js
index 25a3e94..a9ddbc4 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/NumericStepper.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/NumericStepper.js
@@ -15,6 +15,7 @@
goog.provide('org.apache.flex.html.NumericStepper');
goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.events.Event');
goog.require('org.apache.flex.html.Spinner');
goog.require('org.apache.flex.html.TextInput');
goog.require('org.apache.flex.html.beads.models.RangeModel');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
index be440cd..db88a86 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
@@ -16,7 +16,7 @@ goog.provide('org.apache.flex.html.beads.ContainerView');
goog.require('org.apache.flex.core.BeadViewBase');
goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.core.ILayoutParent');
+goog.require('org.apache.flex.core.ILayoutHost');
goog.require('org.apache.flex.core.IViewport');
goog.require('org.apache.flex.core.IViewportModel');
goog.require('org.apache.flex.geom.Rectangle');
@@ -27,6 +27,7 @@ goog.require('org.apache.flex.utils.CSSContainerUtils');
/**
* @constructor
* @extends {org.apache.flex.core.BeadViewBase}
+ * @implements {org.apache.flex.core.ILayoutHost}
*/
org.apache.flex.html.beads.ContainerView = function() {
this.lastSelectedIndex = -1;
@@ -48,7 +49,7 @@ goog.inherits(
org.apache.flex.html.beads.ContainerView.prototype.FLEXJS_CLASS_INFO =
{ names: [{ name: 'ContainerView',
qName: 'org.apache.flex.html.beads.ContainerView' }],
- interfaces: [org.apache.flex.core.ILayoutParent]
+ interfaces: [org.apache.flex.core.ILayoutHost]
};
@@ -300,6 +301,72 @@ org.apache.flex.html.beads.ContainerView.
};
+/**
+ * @expose
+ * @return {number} The count of the elements in this object.
+ */
+org.apache.flex.html.beads.ContainerView.prototype.numElements =
+ function() {
+ return this.contentView.numElements();
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element being added.
+ * @param {boolean=} opt_dispatchEvent If true and event is dispatched.
+ */
+org.apache.flex.html.beads.ContainerView.prototype.addElement =
+ function(c, opt_dispatchEvent) {
+ this.contentView.addElement(c, opt_dispatchEvent);
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element being added.
+ * @param {number} index The index of the new element.
+ * @param {boolean=} opt_dispatchEvent If true and event is dispatched.
+ */
+org.apache.flex.html.beads.ContainerView.prototype.addElementAt =
+ function(c, index, opt_dispatchEvent) {
+ this.contentView.addElementAt(c, index, opt_dispatchEvent);
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element being removed.
+ * @param {boolean=} opt_dispatchEvent If true and event is dispatched.
+ */
+org.apache.flex.html.beads.ContainerView.prototype.removeElement =
+ function(c, opt_dispatchEvent) {
+ this.contentView.removeElement(c, opt_dispatchEvent);
+};
+
+
+/**
+ * @expose
+ * @param {Object} c The element whose index is sought.
+ * @return {number} The index of the given element.
+ */
+org.apache.flex.html.beads.ContainerView.prototype.getElementIndex =
+ function(c) {
+ return this.contentView.getElementIndex(c);
+};
+
+
+/**
+ * @expose
+ * @param {number} index The index of the element.
+ * @return {Object} The element at the given index.
+ */
+org.apache.flex.html.beads.ContainerView.prototype.getElementAt =
+ function(index) {
+ return this.contentView.getElementAt(index);
+};
+
+
Object.defineProperties(org.apache.flex.html.beads.ContainerView.prototype, {
/** @export */
contentView: {
@@ -324,8 +391,7 @@ Object.defineProperties(org.apache.flex.html.beads.ContainerView.prototype, {
set: function(value) {
org.apache.flex.utils.Language.superSetter(org.apache.flex.html.beads.ContainerView, this, 'strand', value);
this.createViewport();
- this.host.addElement(this.viewport.contentView);
- this.host.setActualParent(this.viewport.contentView);
+ this.host.strandChildren.addElement(this.viewport.contentView, false);
this._strand.addEventListener('initComplete',
org.apache.flex.utils.Language.closure(this.initCompleteHandler, this, 'initCompleteHandler'));
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
index 3965772..f0e02b7 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
@@ -81,7 +81,7 @@ Object.defineProperties(org.apache.flex.html.beads.PanelView.prototype, {
this.titleBar_.id = 'panelTitleBar';
this.titleBar_.model = value.model;
this.titleBarAdded_ = true;
- value.addElement(this.titleBar_);
+ value.strandChildren.addElement(this.titleBar_);
// this._strand.controlBar =
// new org.apache.flex.html.ControlBar();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js
index 80f0f42..4a7401b 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js
@@ -16,6 +16,7 @@ goog.provide('org.apache.flex.html.beads.layouts.BasicLayout');
goog.require('org.apache.flex.core.IBeadLayout');
goog.require('org.apache.flex.core.ILayoutChild');
+goog.require('org.apache.flex.core.ILayoutHost');
goog.require('org.apache.flex.core.ValuesManager');
goog.require('org.apache.flex.utils.Language');
@@ -62,7 +63,7 @@ org.apache.flex.html.beads.layouts.BasicLayout.
prototype.layout = function() {
var i, n, h, w;
- var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutParent);
+ var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutHost);
var contentView = viewBead.contentView;
w = contentView.width;
var hasWidth = !this.strand_.isWidthSizedToContent();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
index e6e1ee3..04a3292 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
@@ -15,6 +15,7 @@
goog.provide('org.apache.flex.html.beads.layouts.ButtonBarLayout');
goog.require('org.apache.flex.core.IBeadLayout');
+goog.require('org.apache.flex.core.ILayoutHost');
goog.require('org.apache.flex.html.beads.ListView');
@@ -74,7 +75,7 @@ Object.defineProperties(org.apache.flex.html.beads.layouts.ButtonBarLayout.proto
org.apache.flex.html.beads.layouts.ButtonBarLayout.
prototype.layout = function() {
- var layoutParent = this.strand_.getBeadByType(org.apache.flex.core.ILayoutParent);
+ var layoutParent = this.strand_.getBeadByType(org.apache.flex.core.ILayoutHost);
var contentView = layoutParent.contentView;
var itemRendererParent = contentView;
var viewportModel = layoutParent.viewportModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js
index efc75d0..222b2e7 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js
@@ -15,6 +15,7 @@
goog.provide('org.apache.flex.html.beads.layouts.HorizontalLayout');
goog.require('org.apache.flex.core.IBeadLayout');
+goog.require('org.apache.flex.core.ILayoutHost');
@@ -61,7 +62,7 @@ org.apache.flex.html.beads.layouts.HorizontalLayout.
prototype.layout = function() {
var children, i, n;
- var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutParent);
+ var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutHost);
var contentView = viewBead.contentView;
children = contentView.internalChildren();
var hasHeight = !this.strand_.isHeightSizedToContent();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/TileLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/TileLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/TileLayout.js
index 6a8b7e6..a27b630 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/TileLayout.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/TileLayout.js
@@ -15,7 +15,7 @@
goog.provide('org.apache.flex.html.beads.layouts.TileLayout');
goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.core.ILayoutParent');
+goog.require('org.apache.flex.core.ILayoutHost');
@@ -94,7 +94,7 @@ org.apache.flex.html.beads.layouts.TileLayout.
var children, i, n, child;
var xpos, ypos, useWidth, useHeight;
- var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutParent);
+ var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutHost);
var contentView = viewBead.contentView;
children = contentView.internalChildren();
n = children.length;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/031ad2e7/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
index 4d7645e..5627202 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
@@ -15,6 +15,7 @@
goog.provide('org.apache.flex.html.beads.layouts.VerticalLayout');
goog.require('org.apache.flex.core.IBeadLayout');
+goog.require('org.apache.flex.core.ILayoutHost');
goog.require('org.apache.flex.utils.Language');
@@ -64,7 +65,7 @@ org.apache.flex.html.beads.layouts.VerticalLayout.
prototype.layout = function() {
var children, i, n;
- var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutParent);
+ var viewBead = this.strand_.getBeadByType(org.apache.flex.core.ILayoutHost);
var contentView = viewBead.contentView;
children = contentView.internalChildren();
var scv = getComputedStyle(this.strand_.positioner);