You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/03/30 05:21:25 UTC
[01/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Updated DataGrid example to work with recent changes.
Repository: flex-asjs
Updated Branches:
refs/heads/feature/chart-work 3b9d4368b -> 3e8efbdc4
Updated DataGrid example to work with recent changes.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7af092b1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7af092b1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7af092b1
Branch: refs/heads/feature/chart-work
Commit: 7af092b1007e92b97304dd29d12adfcefeb5fa3b
Parents: d1d2754
Author: Peter Ent <pe...@apache.org>
Authored: Fri Mar 24 10:21:39 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Mar 24 10:21:39 2017 -0400
----------------------------------------------------------------------
.../src/main/flex/MyInitialView.mxml | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7af092b1/examples/flexjs/DataGridExample/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataGridExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/DataGridExample/src/main/flex/MyInitialView.mxml
index 2f543e5..8ac036d 100644
--- a/examples/flexjs/DataGridExample/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/DataGridExample/src/main/flex/MyInitialView.mxml
@@ -29,30 +29,31 @@ limitations under the License.
]]>
</fx:Script>
- <js:Label id="output" x="450" y="30" width="100" />
+ <js:Label id="output" x="450" y="30"/>
+
- <js:DataGrid id="dataGrid" x="20" y="30" width="400" height="300" change="dataGridChange()" rowHeight="30">
+ <js:DataGrid id="dataGrid" x="20" y="30" width="400" height="200" change="dataGridChange()" rowHeight="40">
<js:beads>
- <js:DataGridPercentageLayout />
+ <!--<js:DataGridPercentageLayout />-->
<js:ConstantBinding
sourceID="applicationModel"
sourcePropertyName="productList"
destinationPropertyName="dataProvider" />
</js:beads>
<js:columns>
- <js:DataGridColumn label="Image" dataField="image" columnWidth="25" itemRenderer="products.ProductItemRenderer" />
- <js:DataGridColumn label="Title" dataField="title" columnWidth="50" />
- <js:DataGridColumn label="Sales" dataField="sales" columnWidth="25" />
+ <js:DataGridColumn label="Image" dataField="image" columnWidth="100" itemRenderer="products.ProductItemRenderer" />
+ <js:DataGridColumn label="Title" dataField="title" columnWidth="200" />
+ <js:DataGridColumn label="Sales" dataField="sales" columnWidth="100" />
</js:columns>
</js:DataGrid>
- <js:DataGrid id="dataGrid2" x="20" y="400" width="400" height="300" change="dataGridChange()" rowHeight="40">
+ <js:DataGrid id="dataGrid2" x="20" y="300" width="400" height="245" change="dataGridChange()" rowHeight="40">
<js:beads>
- <js:DataGridLinesBead>
+ <!--<js:DataGridLinesBead>
<js:stroke>
<js:SolidColorStroke color="#FF8800" weight="2" />
</js:stroke>
- </js:DataGridLinesBead>
+ </js:DataGridLinesBead>-->
<js:ConstantBinding
sourceID="applicationModel"
sourcePropertyName="productList"
[04/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] - -
Missing implementation of IList in MDL Menu - Clean up List from unused
imports
Posted by pi...@apache.org.
- Missing implementation of IList in MDL Menu
- Clean up List from unused imports
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/00941ff3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/00941ff3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/00941ff3
Branch: refs/heads/feature/chart-work
Commit: 00941ff37d0f5965752cf589be3b9e80b6915f41
Parents: 13ed095
Author: piotrz <pi...@apache.org>
Authored: Fri Mar 24 22:03:05 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Fri Mar 24 22:03:05 2017 +0100
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/List.as | 17 +++--
.../src/main/flex/org/apache/flex/mdl/Menu.as | 68 ++++++++++++++++++--
2 files changed, 73 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/00941ff3/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
index cbfcf11..a9d78e9 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
@@ -25,12 +25,10 @@ package org.apache.flex.mdl
import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.ILayoutView;
import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IFactory;
import org.apache.flex.core.UIBase;
import org.apache.flex.core.IChild;
import org.apache.flex.events.ItemAddedEvent;
- import org.apache.flex.events.ItemClickedEvent;
import org.apache.flex.events.ItemRemovedEvent;
COMPILE::JS
@@ -132,10 +130,15 @@ package org.apache.flex.mdl
{
return this;
}
-
- /**
- *
- */
+
+ /**
+ * @copy org.apache.flex.core.IList#dataGroup
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
public function get dataGroup():IItemRendererParent
{
return this;
@@ -168,7 +171,7 @@ package org.apache.flex.mdl
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public function get hasItemRenderer():Boolean
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/00941ff3/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
index 3d5cb37..b860fac 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
@@ -20,15 +20,15 @@ package org.apache.flex.mdl
{
import org.apache.flex.core.GroupBase;
import org.apache.flex.core.IChild;
+ import org.apache.flex.core.IFactory;
import org.apache.flex.core.IItemRenderer;
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.ILayoutView;
- import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IList;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.events.ItemAddedEvent;
- import org.apache.flex.events.ItemClickedEvent;
import org.apache.flex.events.ItemRemovedEvent;
COMPILE::JS
@@ -53,7 +53,7 @@ package org.apache.flex.mdl
* @playerversion AIR 2.6
* @productversion FlexJS 0.8
*/
- public class Menu extends GroupBase implements IItemRendererParent, ILayoutParent, ILayoutHost, ILayoutView
+ public class Menu extends GroupBase implements IItemRendererParent, ILayoutParent, ILayoutHost, ILayoutView, IList
{
/**
* Constructor.
@@ -145,7 +145,65 @@ package org.apache.flex.mdl
{
return this;
}
-
+
+ /**
+ * @copy org.apache.flex.core.IList#dataGroup
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function get dataGroup():IItemRendererParent
+ {
+ return this;
+ }
+
+ private var _itemRenderer:IFactory;
+
+ /**
+ * The class or factory used to display each item.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function get itemRenderer():IFactory
+ {
+ return _itemRenderer;
+ }
+ public function set itemRenderer(value:IFactory):void
+ {
+ _itemRenderer = value;
+ }
+
+ /**
+ * Returns whether or not the itemRenderer property has been set.
+ *
+ * @see org.apache.flex.core.IItemRendererProvider
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function get hasItemRenderer():Boolean
+ {
+ var result:Boolean = false;
+
+ COMPILE::SWF {
+ result = _itemRenderer != null;
+ }
+
+ COMPILE::JS {
+ var test:* = _itemRenderer;
+ result = _itemRenderer !== null && test !== undefined;
+ }
+
+ return result;
+ }
+
/**
* @copy org.apache.flex.core.IItemRendererParent#addItemRenderer()
* @private
@@ -216,7 +274,7 @@ package org.apache.flex.mdl
/**
* update all item renderers
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
[14/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Posted by pi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f7a36104
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f7a36104
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f7a36104
Branch: refs/heads/feature/chart-work
Commit: f7a36104baaf7f26b311b95dcfc6000a869de5d5
Parents: 82b51ba 3dc3eb3
Author: piotrz <pi...@apache.org>
Authored: Wed Mar 29 06:32:19 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Mar 29 06:32:19 2017 +0200
----------------------------------------------------------------------
examples/flexjs/pom.xml | 2 +-
.../projects/HTML/src/main/flex/org/apache/flex/html/Panel.as | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[12/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Exclude .idea folder from rat checking
Posted by pi...@apache.org.
Exclude .idea folder from rat checking
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/82b51ba2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/82b51ba2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/82b51ba2
Branch: refs/heads/feature/chart-work
Commit: 82b51ba22bb50ee0c8f89231d05473b80d3a39d8
Parents: 6c71106
Author: piotrz <pi...@apache.org>
Authored: Wed Mar 29 06:20:28 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Mar 29 06:20:28 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/82b51ba2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8cf9166..3b7fb24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,7 @@
<exclude>testsuite/**</exclude>
<!-- Ignore IntelliJ IDEA project files -->
<exclude>**/*.iml</exclude>
+ <exclude>**/.idea/**</exclude>
</excludes>
</configuration>
<dependencies>
[10/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
When x or y is set, change the style position to "absolute".
Posted by pi...@apache.org.
When x or y is set, change the style position to "absolute".
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6c71106e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6c71106e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6c71106e
Branch: refs/heads/feature/chart-work
Commit: 6c71106e120b5b2f366b314e904dbcaadcf2ff2c
Parents: ce25c47
Author: Peter Ent <pe...@apache.org>
Authored: Mon Mar 27 16:06:46 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Mar 27 16:06:46 2017 -0400
----------------------------------------------------------------------
.../HTML/src/main/flex/org/apache/flex/core/UIBase.as | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6c71106e/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
index af9e255..dfe94bf 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
@@ -637,7 +637,7 @@ package org.apache.flex.core
COMPILE::JS
public function set x(value:Number):void
{
-// positioner.style.position = 'absolute';
+ positioner.style.position = 'absolute';
positioner.style.left = value + 'px';
}
@@ -670,7 +670,7 @@ package org.apache.flex.core
}
COMPILE::JS
{
-// positioner.style.position = 'absolute';
+ positioner.style.position = 'absolute';
positioner.style.left = value + 'px';
}
}
@@ -693,7 +693,7 @@ package org.apache.flex.core
COMPILE::JS
public function set y(value:Number):void
{
-// positioner.style.position = 'absolute';
+ positioner.style.position = 'absolute';
positioner.style.top = value + 'px';
}
@@ -726,7 +726,7 @@ package org.apache.flex.core
}
COMPILE::JS
{
-// positioner.style.position = 'absolute';
+ positioner.style.position = 'absolute';
positioner.style.top = value + 'px';
}
}
[08/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Removed what appears to be a typo, causing warning in GCC
Posted by pi...@apache.org.
Removed what appears to be a typo, causing warning in GCC
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6714cff2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6714cff2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6714cff2
Branch: refs/heads/feature/chart-work
Commit: 6714cff23da1a4be108a7093013f052691df70be
Parents: bea3e94
Author: greg-dove <gr...@gmail.com>
Authored: Mon Mar 27 08:45:40 2017 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Mon Mar 27 08:45:40 2017 +1300
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/org/apache/flex/html/Form.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6714cff2/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Form.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Form.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Form.as
index 2093e40..f50fdf9 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Form.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Form.as
@@ -56,7 +56,7 @@ package org.apache.flex.html
*/
COMPILE::JS
override protected function createElement():WrappedHTMLElement
- {HTMLFormElement
+ {
element = document.createElement('form') as WrappedHTMLElement;
positioner = element;
[15/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] - Fix
ListExample: - Cleanup all unnecessary code - Clean up pom - Bring back
ListExample to Maven build
Posted by pi...@apache.org.
Fix ListExample:
- Cleanup all unnecessary code
- Clean up pom
- Bring back ListExample to 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/04ad0ed7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/04ad0ed7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/04ad0ed7
Branch: refs/heads/feature/chart-work
Commit: 04ad0ed75ca0ff74b7cfc8916193c64c56eb4e53
Parents: f7a3610
Author: piotrz <pi...@apache.org>
Authored: Wed Mar 29 22:15:55 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Mar 29 22:15:55 2017 +0200
----------------------------------------------------------------------
examples/flexjs/ListExample/pom.xml | 33 ----------
.../src/main/flex/MyInitialView.mxml | 4 --
.../src/main/flex/simple/GenericList.as | 66 ++------------------
.../src/main/flex/simple/GenericListView.as | 38 ++---------
.../main/flex/simple/IRFactoryForArrayData.as | 2 +-
examples/flexjs/pom.xml | 2 +-
6 files changed, 11 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/pom.xml b/examples/flexjs/ListExample/pom.xml
index 1904e11..190702b 100644
--- a/examples/flexjs/ListExample/pom.xml
+++ b/examples/flexjs/ListExample/pom.xml
@@ -46,30 +46,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>ListExample.mxml</mainClass>
- <removeCirculars>true</removeCirculars>
- <!-- Not a config option of flexjs-maven-plugin -->
- <!--flashVersion>20.0</flashVersion-->
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
- <!-- Already added in parent -->
- <!--dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
-
<!-- Needed for Flash compilation -->
<dependency>
<groupId>com.adobe.flash.framework</groupId>
@@ -78,20 +60,5 @@
<type>swc</type>
<scope>provided</scope>
</dependency>
-
- <!-- Needed for JavaScript compilation -->
- <!-- Already added in parent -->
- <!--dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
index 154149c..09543ae 100644
--- a/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
@@ -20,10 +20,6 @@ limitations under the License.
<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:gen="simple.*">
- <fx:Script>
-
- </fx:Script>
-
<fx:Style>
@namespace gen "simple.*";
@namespace js "library://ns.apache.org/flexjs/basic";
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as b/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
index c582b6f..1543167 100644
--- a/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
+++ b/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
@@ -18,75 +18,17 @@
////////////////////////////////////////////////////////////////////////////////
package simple
{
- import org.apache.flex.core.IItemRenderer;
- import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.ILayoutHost;
- import org.apache.flex.core.ILayoutParent;
- import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.IParentIUIBase;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.core.IChild;
+ import org.apache.flex.html.DataContainer;
- /**
+ /**
* GenericList relies on an itemRenderer factory to produce its children componenents
* and on a layout to arrange them. This is the only UI element aside from the itemRenderers.
*/
- public class GenericList extends UIBase implements IItemRendererParent, ILayoutParent, ILayoutHost
+ public class GenericList extends DataContainer
{
public function GenericList()
{
super();
}
-
- public function get dataProvider():Object
- {
- return ISelectionModel(model).dataProvider;
- }
- public function set dataProvider(value:Object):void
- {
- ISelectionModel(model).dataProvider = value;
- }
-
- public function get labelField():String
- {
- return ISelectionModel(model).labelField;
- }
- public function set labelField(value:String):void
- {
- ISelectionModel(model).labelField = value;
- }
-
- public function getLayoutHost():ILayoutHost
- {
- return this;
- }
-
- public function get contentView():IParentIUIBase
- {
- return this;
- }
-
- public function getItemRendererForIndex(index:int):IItemRenderer
- {
- var child:IItemRenderer = getElementAt(index) as IItemRenderer;
- return child;
- }
-
- public function removeAllElements():void
- {
- while (numElements > 0) {
- var child:IChild = getElementAt(0);
- removeElement(child);
- }
- }
-
- public function updateAllItemRenderers():void
- {
- //todo: IItemRenderer does not define update function but DataItemRenderer does
- //for(var i:int = 0; i < numElements; i++) {
- // var child:IItemRenderer = getElementAt(i) as IItemRenderer;
- // child.update();
- //}
- }
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as b/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
index d14a6f8..f4ee1fb 100644
--- a/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
+++ b/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
@@ -18,35 +18,24 @@
////////////////////////////////////////////////////////////////////////////////
package simple
{
- import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IDataProviderItemRendererMapper;
- import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.ValuesManager;
- import org.apache.flex.html.beads.IListView;
import org.apache.flex.events.Event;
+ import org.apache.flex.html.beads.ListView;
- /**
+ /**
* GenericListView makes sure the itemRendererFactory and the layout beads are installed.
*/
- public class GenericListView extends BeadViewBase implements IListView
+ public class GenericListView extends ListView
{
public function GenericListView()
{
super();
}
- public function get dataGroup():IItemRendererParent
- {
- return _strand as IItemRendererParent;
- }
-
- protected var listModel:ISelectionModel;
-
override public function set strand(value:IStrand):void
{
super.strand = value;
@@ -62,33 +51,16 @@ package simple
host.addEventListener("itemsCreated", itemsCreatedHandler);
- listModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- listModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
-
performLayout(null);
}
/**
* @private
*/
- protected function itemsCreatedHandler(event:Event):void
- {
- performLayout(event);
- }
-
- /**
- * @private
- */
- protected function dataProviderChangeHandler(event:Event):void
+ override protected function performLayout(event:Event):void
{
- performLayout(event);
- }
+ super.performLayout(event);
- /**
- * @private
- */
- protected function performLayout(event:Event):void
- {
var layout:IBeadLayout = _strand.getBeadByType(IBeadLayout) as IBeadLayout;
if (layout == null) {
var c:Class = ValuesManager.valuesImpl.getValue(host, "iBeadLayout");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as b/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
index ad0a37e..956b847 100644
--- a/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
+++ b/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
@@ -141,7 +141,7 @@ package simple
if (!dp)
return;
- dataGroup.removeAllElements();
+ dataGroup.removeAllItemRenderers();
var listView:IListView = _strand.getBeadByType(IListView) as IListView;
var presentationModel:IListPresentationModel = _strand.getBeadByType(IListPresentationModel) as IListPresentationModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index d49f223..0831f2f 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -50,7 +50,7 @@
<module>FlexTeamPage_MDL</module>
<module>FlexWebsiteStatsViewer</module>
<module>HelloWorld</module>
- <!--<module>ListExample</module>-->
+ <module>ListExample</module>
<module>MapSearch</module>
<!--module>MDLBlogExample</module>-->
<module>MDLDynamicTabsExample</module>
[09/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Added CSSCheckBox
Posted by pi...@apache.org.
Added CSSCheckBox
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ce25c472
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ce25c472
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ce25c472
Branch: refs/heads/feature/chart-work
Commit: ce25c4722f67a7f9bbba316490c8b6c9a3d6c234
Parents: 6714cff
Author: Harbs <ha...@in-tools.com>
Authored: Mon Mar 27 16:42:34 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Mar 27 16:42:34 2017 +0300
----------------------------------------------------------------------
.../flex/org/apache/flex/html/CSSCheckBox.as | 219 +++++++++++++++++++
.../HTML/src/main/resources/basic-manifest.xml | 1 +
.../HTML/src/main/resources/defaults.css | 6 +
3 files changed, 226 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ce25c472/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CSSCheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CSSCheckBox.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CSSCheckBox.as
new file mode 100644
index 0000000..40c0b7a
--- /dev/null
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CSSCheckBox.as
@@ -0,0 +1,219 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.html
+{
+ COMPILE::SWF
+ {
+ import flash.events.MouseEvent;
+ }
+
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IToggleButtonModel;
+ import org.apache.flex.core.IUIBase;
+ COMPILE::SWF
+ {
+ import org.apache.flex.core.UIButtonBase;
+ }
+ COMPILE::JS
+ {
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.WrappedHTMLElement;
+ import org.apache.flex.html.supportClasses.CheckBoxIcon;
+ }
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.MouseEvent;
+
+ //--------------------------------------
+ // Events
+ //--------------------------------------
+
+ /**
+ * Dispatched when the user checks or un-checks the CSSCheckBox.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
+ /**
+ * The CSSCheckBox class implements the common user interface
+ * control. The CSSCheckBox includes its text label and is styleable using CSS.
+ * To style the checkbox control, a `checkClassName` should be specified which corresponds to a CSS class name.
+ *
+ * @toplevel
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::SWF
+ public class CSSCheckBox extends UIButtonBase implements IStrand
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function CSSCheckBox()
+ {
+ super();
+
+ addEventListener(org.apache.flex.events.MouseEvent.CLICK, internalMouseHandler);
+ }
+
+ /**
+ * The text label for the CSSCheckBox.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get text():String
+ {
+ return IToggleButtonModel(model).text;
+ }
+
+ /**
+ * @private
+ */
+ public function set text(value:String):void
+ {
+ IToggleButtonModel(model).text = value;
+ }
+
+ [Bindable("change")]
+ /**
+ * <code>true</code> if the check mark is displayed.
+ *
+ * @default false
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get selected():Boolean
+ {
+ return IToggleButtonModel(model).selected;
+ }
+
+ /**
+ * @private
+ */
+ public function set selected(value:Boolean):void
+ {
+ IToggleButtonModel(model).selected = value;
+ }
+
+ private function internalMouseHandler(event:org.apache.flex.events.MouseEvent) : void
+ {
+ selected = !selected;
+ dispatchEvent(new Event("change"));
+ }
+ private var _checkClassName:String;
+ public function get checkClassName():String
+ {
+ return _checkClassName;
+ }
+ public function set checkClassName(value:String):void
+ {
+ _checkClassName = value;
+ }
+
+ }
+
+ COMPILE::JS
+ public class CSSCheckBox extends UIBase
+ {
+
+ private var _label:WrappedHTMLElement;
+ private var _icon:CheckBoxIcon;
+ private var _styleDiv:WrappedHTMLElement;
+ private var _textNode:WrappedHTMLElement
+
+ private static var _checkNumber:Number = 0;
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ override protected function createElement():WrappedHTMLElement
+ {
+ element = document.createElement('label') as WrappedHTMLElement;
+ _label = element;
+ _icon = new CheckBoxIcon();
+ element.appendChild(_icon.element);
+ // Add a span to allow checkbox styling
+ _styleDiv = document.createElement('div') as WrappedHTMLElement;
+ if(_checkClassName)
+ _styleDiv.setAttribute("class",_checkClassName)
+ element.appendChild(_styleDiv);
+ _textNode = document.createTextNode('') as WrappedHTMLElement;
+ element.appendChild(_textNode);
+
+ positioner = element;
+ //positioner.style.position = 'relative';
+ element.flexjs_wrapper = this;
+ _icon.element.flexjs_wrapper = this;
+ _styleDiv.flexjs_wrapper = this;
+
+ className = 'CSSCheckBox';
+ typeNames = 'CSSCheckBox';
+
+ return element;
+ }
+
+ private var _checkClassName:String;
+ public function get checkClassName():String
+ {
+ return _checkClassName;
+ }
+ public function set checkClassName(value:String):void
+ {
+ _checkClassName = value;
+ if(_styleDiv)
+ _styleDiv.setAttribute("class",_checkClassName);
+ }
+
+ public function get text():String
+ {
+ return _textNode.nodeValue;
+ }
+
+ public function set text(value:String):void
+ {
+ _textNode.nodeValue = value;
+ }
+
+ public function get selected():Boolean
+ {
+ return (_icon.element as HTMLInputElement).checked;
+ }
+
+ public function set selected(value:Boolean):void
+ {
+ (_icon.element as HTMLInputElement).checked = value;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ce25c472/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
index 8f132a6..53e4a63 100644
--- a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
@@ -42,6 +42,7 @@
<component id="List" class="org.apache.flex.html.List"/>
<component id="SimpleList" class="org.apache.flex.html.SimpleList"/>
<component id="CheckBox" class="org.apache.flex.html.CheckBox"/>
+ <component id="CSSCheckBox" class="org.apache.flex.html.CSSCheckBox"/>
<component id="RadioButton" class="org.apache.flex.html.RadioButton"/>
<component id="ComboBox" class="org.apache.flex.html.ComboBox"/>
<component id="ComboBoxList" class="org.apache.flex.html.supportClasses.ComboBoxList"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ce25c472/frameworks/projects/HTML/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/resources/defaults.css b/frameworks/projects/HTML/src/main/resources/defaults.css
index e7f211d..8158d02 100644
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@ -598,6 +598,12 @@ global
IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
}
+ CSSCheckBox
+ {
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
+ }
+
CloseButton
{
IBeadView: ClassReference("org.apache.flex.html.beads.CloseButtonView");
[03/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Removed Basic project.
Posted by pi...@apache.org.
Removed Basic project.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/13ed0955
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/13ed0955
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/13ed0955
Branch: refs/heads/feature/chart-work
Commit: 13ed09555d3f5aa55718a056154ba9ea33a69c40
Parents: ca93c2c
Author: Peter Ent <pe...@apache.org>
Authored: Fri Mar 24 11:51:23 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Mar 24 11:51:23 2017 -0400
----------------------------------------------------------------------
frameworks/projects/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13ed0955/frameworks/projects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index 4ee0a13..66e9019 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -46,7 +46,7 @@
<module>FontAwesome</module>
<module>GoogleMaps</module>
<module>Graphics</module>
- <module>Basic</module>
+ <!--<module>Basic</module>-->
<module>HTML</module>
<module>HTML5</module>
<module>JQuery</module>
[02/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Updated DataBindingExample to work with recent changes.
Posted by pi...@apache.org.
Updated DataBindingExample to work with recent changes.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ca93c2c8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ca93c2c8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ca93c2c8
Branch: refs/heads/feature/chart-work
Commit: ca93c2c8db02caf7b74e4a2c6a5c802307c26d39
Parents: 7af092b
Author: Peter Ent <pe...@apache.org>
Authored: Fri Mar 24 10:26:20 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Mar 24 10:26:20 2017 -0400
----------------------------------------------------------------------
.../src/main/flex/MyInitialView.mxml | 79 ++++++++++----------
1 file changed, 41 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ca93c2c8/examples/flexjs/DataBindingExample/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/DataBindingExample/src/main/flex/MyInitialView.mxml
index 9adb77d..c8d4b81 100644
--- a/examples/flexjs/DataBindingExample/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/DataBindingExample/src/main/flex/MyInitialView.mxml
@@ -71,6 +71,10 @@ limitations under the License.
<fx:Style>
@namespace basic "library://ns.apache.org/flexjs/basic";
+ .inner {
+ width: 400px;
+ }
+
.output {
font-size: 20px;
}
@@ -80,16 +84,16 @@ limitations under the License.
}
.leftSide {
- margin: 5px;
- width: 200px;
+ flex-grow: 1;
+ margin: 6px;
}
.symbolInput {
}
.rightSide {
- margin: 5px;
- width: 200px;
+ flex-grow: 1;
+ margin: 6px;
}
.quoteButton {
@@ -109,41 +113,40 @@ limitations under the License.
<js:Label text="Enter Stock Symbol or choose from list:" />
- <js:Container className="inner" width="400">
- <js:beads>
- <js:HorizontalFlexLayout />
- </js:beads>
-
- <js:Container className="leftSide">
- <js:beads>
- <js:VerticalLayout />
- </js:beads>
- <js:TextInput id="symbolTI" text="{MyModel(applicationModel).stockSymbol}" className="symbolInput" width="50%" />
- <js:TextButton text="Get Quote" className="quoteButton" width="50%"
- click="_symbol = symbolTI.text; dispatchEvent(new CustomEvent('buttonClicked'))" />
- <js:Label id="field" text="{fieldText}"/>
- <js:Label className="output" height="24" text="{MyModel(applicationModel).responseText}" />
- </js:Container>
+ <js:Group className="inner">
+ <js:beads>
+ <js:HorizontalFlexLayout />
+ </js:beads>
- <js:Container className="rightSide">
- <js:beads>
- <js:VerticalFlexLayout />
- </js:beads>
- <js:DropDownList id="list" width="50%"
- change="_symbol = list.selectedItem as String; dispatchEvent(new CustomEvent('listChanged'))"
- dataProvider="{MyModel(applicationModel).strings}" />
- <js:RadioButton id="radio1" text="Price" value="Ask" groupName="group1" change="radioChanged(event)"/>
- <js:RadioButton id="radio2" text="Change" value="Change" groupName="group1" change="radioChanged(event)"/>
- <js:RadioButton id="radio3" text="Day's High" value="DaysHigh" groupName="group1" change="radioChanged(event)"/>
- <js:RadioButton id="radio4" text="Day's Low" value="DaysLow" groupName="group1" change="radioChanged(event)"/>
- <js:CheckBox id="showAllData" text="Show All Data" change="setState()" />
- </js:Container>
+ <js:Group className="leftSide">
+ <js:beads>
+ <js:VerticalFlexLayout />
+ </js:beads>
+ <js:TextInput id="symbolTI" text="{MyModel(applicationModel).stockSymbol}" className="symbolInput" width="50%" />
+ <js:TextButton text="Get Quote" className="quoteButton" width="50%"
+ click="_symbol = symbolTI.text; dispatchEvent(new CustomEvent('buttonClicked'))" />
+ <js:Label id="field" text="{fieldText}"/>
+ <js:Label className="output" height="24" text="{MyModel(applicationModel).responseText}" />
+ </js:Group>
- </js:Container>
+ <js:Group className="rightSide">
+ <js:beads>
+ <js:VerticalFlexLayout />
+ </js:beads>
+ <js:DropDownList id="list" width="50%"
+ change="_symbol = list.selectedItem as String; dispatchEvent(new CustomEvent('listChanged'))"
+ dataProvider="{MyModel(applicationModel).strings}" />
+ <js:RadioButton id="radio1" text="Price" value="Ask" groupName="group1" change="radioChanged(event)"/>
+ <js:RadioButton id="radio2" text="Change" value="Change" groupName="group1" change="radioChanged(event)"/>
+ <js:RadioButton id="radio3" text="Day's High" value="DaysHigh" groupName="group1" change="radioChanged(event)"/>
+ <js:RadioButton id="radio4" text="Day's Low" value="DaysLow" groupName="group1" change="radioChanged(event)"/>
+ <js:CheckBox id="showAllData" text="Show All Data" change="setState()" />
+ </js:Group>
+ </js:Group>
- <js:Label id="bindtest" text="{fieldText + ' expression binding'}" />
- <js:Label width="300" text.showAll="110" includeIn="showAll" />
- <js:TextArea id="ta" width="100%" height="100" height.showAll="110"
- includeIn="showAll"
- text="{MyModel(applicationModel).allData}" />
+ <js:Label id="bindtest" text="{fieldText + ' expression binding'}" />
+ <js:Label width="300" text.showAll="110" includeIn="showAll" />
+ <js:TextArea id="ta" width="100%" height="100" height.showAll="110"
+ includeIn="showAll"
+ text="{MyModel(applicationModel).allData}" />
</js:View>
[05/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Update MDL FlexTeamPage with newest changes
Posted by pi...@apache.org.
Update MDL FlexTeamPage with newest changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/04f9713e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/04f9713e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/04f9713e
Branch: refs/heads/feature/chart-work
Commit: 04f9713e2b884a63fbc94bdd02c02f32537448bf
Parents: 00941ff
Author: piotrz <pi...@apache.org>
Authored: Fri Mar 24 22:37:09 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Fri Mar 24 22:37:09 2017 +0100
----------------------------------------------------------------------
.../src/main/flex/MainView.mxml | 25 +++---
.../flex/itemRenderers/MemberItemRenderer.mxml | 4 +-
.../src/main/flex/models/MembersModel.as | 92 ++++++++++----------
.../src/main/flex/vos/MemberVO.as | 19 ++--
4 files changed, 69 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04f9713e/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml
index 107dbbd..51cc09c 100644
--- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml
+++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml
@@ -17,19 +17,19 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<basic:View xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:basic="library://ns.apache.org/flexjs/basic" xmlns:models="models.*"
- xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:binding="org.apache.flex.binding.*">
+<js:View xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:models="models.*"
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:binding="org.apache.flex.binding.*"
+ xmlns:js="library://ns.apache.org/flexjs/basic">
- <basic:beads>
- <basic:ViewDataBinding />
- </basic:beads>
+ <js:beads>
+ <js:ViewDataBinding />
+ </js:beads>
- <basic:model>
+ <js:model>
<models:MembersModel/>
- </basic:model>
+ </js:model>
- <basic:Container width="100%" height="100%" className="container">
+ <js:Group width="100%" height="100%">
<!--<basic:H1 text="FlexJS Team page"></basic:H1>-->
<mdl:List labelField="name" className="memberListItemRenderer membersList">
<mdl:beads>
@@ -37,9 +37,8 @@ limitations under the License.
sourceID="model"
sourcePropertyName="members"
destinationPropertyName="dataProvider"
- eventName="membersChanged"
- />
+ eventName="membersChanged"/>
</mdl:beads>
</mdl:List>
- </basic:Container>
-</basic:View>
\ No newline at end of file
+ </js:Group>
+</js:View>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04f9713e/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
index ad8004b..f2c24e1 100644
--- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
+++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
@@ -56,10 +56,10 @@ limitations under the License.
<js:H6 text="{member.apacheID}"></js:H6>
</mdl:CardTitle>
<mdl:CardSupportingText>
- <js:Container className="cardRow1">
+ <js:Group className="cardRow1">
<js:HTMLText html="{member.bio}" className="bio"/>
<js:Image src="http://flex.apache.org/{member.photoURL}" className="photo"/>
- </js:Container>
+ </js:Group>
<!--<js:TextNode text="{member.bio}"/>-->
</mdl:CardSupportingText>
<mdl:Spacer height="20"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04f9713e/examples/flexjs/FlexTeamPage_MDL/src/main/flex/models/MembersModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/models/MembersModel.as b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/models/MembersModel.as
index 9eec224..7b83231 100644
--- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/models/MembersModel.as
+++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/models/MembersModel.as
@@ -18,64 +18,62 @@
////////////////////////////////////////////////////////////////////////////////
package models
{
-import org.apache.flex.events.Event;
-import org.apache.flex.events.EventDispatcher;
-import org.apache.flex.html.TextNode;
-import org.apache.flex.net.HTTPService;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.net.HTTPService;
-import vos.MemberVO;
+ import vos.MemberVO;
-[Event(name="membersChanged", type="org.apache.flex.events.Event")]
+ [Event(name="membersChanged", type="org.apache.flex.events.Event")]
-public class MembersModel extends EventDispatcher
-{
+ public class MembersModel extends EventDispatcher
+ {
- private var _members:Array = [];
+ private var _members:Array = [];
- public function MembersModel() {
- loadMembers();
- }
+ public function MembersModel() {
+ loadMembers();
+ }
- protected function loadMembers():void {
- var httpService:HTTPService = new HTTPService();
- httpService.url = 'http://flex.apache.org/team/team.json';
- httpService.addEventListener("complete", handleLoadComplete);
- httpService.addEventListener("ioError", handleError);
- httpService.send();
- }
+ protected function loadMembers():void {
+ var httpService:HTTPService = new HTTPService();
+ httpService.url = 'http://flex.apache.org/team/team.json';
+ httpService.addEventListener("complete", handleLoadComplete);
+ httpService.addEventListener("ioError", handleError);
+ httpService.send();
+ }
- protected function handleLoadComplete(event:Event):void
- {
- var responseStr:String = event.target._element.response;
- //Remove the comments
- responseStr = responseStr.substr(responseStr.indexOf('{'),responseStr.length);
- var response:Object = JSON.parse(responseStr);
- createMemberVOs(response.members);
- }
+ protected function handleLoadComplete(event:Event):void
+ {
+ var responseStr:String = event.target._element.response;
+ //Remove the comments
+ responseStr = responseStr.substr(responseStr.indexOf('{'),responseStr.length);
+ var response:Object = JSON.parse(responseStr);
+ createMemberVOs(response.members);
+ }
- protected function handleError(event:Event):void
- {
- trace('Error loading team.json from http://flex.apache.org/team/team.json');
- }
+ protected function handleError(event:Event):void
+ {
+ trace('Error loading team.json from http://flex.apache.org/team/team.json');
+ }
- protected function createMemberVOs(membersArr:Array):void {
- var v:Array = membersArr.map(function(memberObj):MemberVO {
- return new MemberVO(memberObj.name,memberObj.apacheID,memberObj.photoURL,memberObj.bio,memberObj.twitter,memberObj.linkedIn,memberObj.facebook);
- });
- this.members = v;
- }
+ protected function createMemberVOs(membersArr:Array):void {
+ var v:Array = membersArr.map(function(memberObj):MemberVO {
+ return new MemberVO(memberObj.name,memberObj.apacheID,memberObj.photoURL,memberObj.bio,memberObj.twitter,memberObj.linkedIn,memberObj.facebook);
+ });
+ this.members = v;
+ }
- public function set members(v:Array):void {
- _members = v;
- dispatchEvent( new Event("membersChanged") );
- var t:TextNode = new TextNode();
- }
+ public function set members(value:Array):void {
+ _members = value;
+ dispatchEvent( new Event("membersChanged") );
+ }
- public function get members():Array
- {
- return _members;
- }
+ public function get members():Array
+ {
+ return _members;
+ }
-}
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04f9713e/examples/flexjs/FlexTeamPage_MDL/src/main/flex/vos/MemberVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/vos/MemberVO.as b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/vos/MemberVO.as
index e558bc2..40b3d88 100644
--- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/vos/MemberVO.as
+++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/vos/MemberVO.as
@@ -17,8 +17,10 @@
//
////////////////////////////////////////////////////////////////////////////////
package vos {
- public class MemberVO {
+ [Bindable]
+ public class MemberVO
+ {
public function MemberVO(name:String,apacheID:String,photoURL:String,bio:String,twitter:String,linkedIn:String,facebook:String){
this.name = name;
this.apacheID = apacheID;
@@ -29,13 +31,12 @@ package vos {
this.facebook = facebook;
}
- [Bindable] public var name:String;
- [Bindable] public var title:String;
- [Bindable] public var apacheID:String;
- [Bindable] public var photoURL:String;
- [Bindable] public var bio:String;
- [Bindable] public var twitter:String;
- [Bindable] public var linkedIn:String;
- [Bindable] public var facebook:String;
+ public var name:String;
+ public var apacheID:String;
+ public var photoURL:String;
+ public var bio:String;
+ public var twitter:String;
+ public var linkedIn:String;
+ public var facebook:String;
}
}
[06/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Update MDLDynamicTabsExample
Posted by pi...@apache.org.
Update MDLDynamicTabsExample
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/208b6421
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/208b6421
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/208b6421
Branch: refs/heads/feature/chart-work
Commit: 208b6421253b840d58e57cbda2ca50e1140cf55c
Parents: 04f9713
Author: piotrz <pi...@apache.org>
Authored: Fri Mar 24 22:44:07 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Fri Mar 24 22:44:07 2017 +0100
----------------------------------------------------------------------
.../flexjs/MDLDynamicTabsExample/src/main/flex/TabsExample.mxml | 4 +++-
.../MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/208b6421/examples/flexjs/MDLDynamicTabsExample/src/main/flex/TabsExample.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLDynamicTabsExample/src/main/flex/TabsExample.mxml b/examples/flexjs/MDLDynamicTabsExample/src/main/flex/TabsExample.mxml
index 48fed82..b79aa36 100644
--- a/examples/flexjs/MDLDynamicTabsExample/src/main/flex/TabsExample.mxml
+++ b/examples/flexjs/MDLDynamicTabsExample/src/main/flex/TabsExample.mxml
@@ -29,6 +29,8 @@ limitations under the License.
</js:valuesImpl>
<js:initialView>
- <views:InitialView/>
+ <js:View>
+ <views:InitialView/>
+ </js:View>
</js:initialView>
</mdl:Application>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/208b6421/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml b/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml
index 547486d..c5f573c 100644
--- a/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml
+++ b/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml
@@ -21,7 +21,7 @@ limitations under the License.
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:models="models.*" xmlns:local="*">
+ xmlns:models="models.*">
<fx:Script>
<![CDATA[
import org.apache.flex.events.MouseEvent;
[16/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Merge branch 'develop' into feature/chart-work
Posted by pi...@apache.org.
Merge branch 'develop' into feature/chart-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/3e8efbdc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3e8efbdc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3e8efbdc
Branch: refs/heads/feature/chart-work
Commit: 3e8efbdc42e85617f4216f32d2e23b5031af5b82
Parents: 3b9d436 04ad0ed
Author: piotrz <pi...@apache.org>
Authored: Thu Mar 30 06:56:37 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Mar 30 06:56:37 2017 +0200
----------------------------------------------------------------------
.../src/main/flex/MyInitialView.mxml | 79 +++----
.../src/main/flex/MyInitialView.mxml | 19 +-
.../src/main/flex/MainView.mxml | 25 +--
.../flex/itemRenderers/MemberItemRenderer.mxml | 4 +-
.../src/main/flex/models/MembersModel.as | 92 ++++----
.../src/main/flex/vos/MemberVO.as | 19 +-
examples/flexjs/ListExample/pom.xml | 33 ---
.../src/main/flex/MyInitialView.mxml | 4 -
.../src/main/flex/simple/GenericList.as | 66 +-----
.../src/main/flex/simple/GenericListView.as | 38 +---
.../main/flex/simple/IRFactoryForArrayData.as | 2 +-
.../src/main/flex/TabsExample.mxml | 4 +-
.../src/main/flex/views/InitialView.mxml | 2 +-
examples/flexjs/pom.xml | 4 +-
.../main/flex/org/apache/flex/core/UIBase.as | 8 +-
.../flex/org/apache/flex/html/CSSCheckBox.as | 219 +++++++++++++++++++
.../src/main/flex/org/apache/flex/html/Form.as | 2 +-
.../src/main/flex/org/apache/flex/html/Panel.as | 6 +
.../HTML/src/main/resources/basic-manifest.xml | 1 +
.../HTML/src/main/resources/defaults.css | 6 +
.../src/main/flex/org/apache/flex/mdl/List.as | 17 +-
.../src/main/flex/org/apache/flex/mdl/Menu.as | 68 +++++-
frameworks/projects/pom.xml | 2 +-
pom.xml | 1 +
24 files changed, 448 insertions(+), 273 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3e8efbdc/frameworks/projects/HTML/src/main/resources/defaults.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3e8efbdc/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
----------------------------------------------------------------------
[13/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
disable ListExample for now
Posted by pi...@apache.org.
disable ListExample for now
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3dc3eb3f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3dc3eb3f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3dc3eb3f
Branch: refs/heads/feature/chart-work
Commit: 3dc3eb3fb581972b180bcbf68fe1141414bc7e47
Parents: 16ee6cd
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 28 21:30:35 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 28 21:30:35 2017 -0700
----------------------------------------------------------------------
examples/flexjs/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3dc3eb3f/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index 0831f2f..d49f223 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -50,7 +50,7 @@
<module>FlexTeamPage_MDL</module>
<module>FlexWebsiteStatsViewer</module>
<module>HelloWorld</module>
- <module>ListExample</module>
+ <!--<module>ListExample</module>-->
<module>MapSearch</module>
<!--module>MDLBlogExample</module>-->
<module>MDLDynamicTabsExample</module>
[11/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
eliminate circular
Posted by pi...@apache.org.
eliminate circular
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/16ee6cdb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/16ee6cdb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/16ee6cdb
Branch: refs/heads/feature/chart-work
Commit: 16ee6cdbc4ecc90b4b2d9ef8336635b9e9ad51f8
Parents: 6c71106
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 28 13:49:58 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 28 13:49:58 2017 -0700
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/org/apache/flex/html/Panel.as | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16ee6cdb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
index 09b5cc1..ab3b114 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
@@ -133,6 +133,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function addElement(c:IChild, dispatchEvent:Boolean = true):void
{
@@ -143,6 +144,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
@@ -153,6 +155,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function getElementIndex(c:IChild):int
{
@@ -162,6 +165,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
@@ -171,6 +175,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function get numElements():int
{
@@ -180,6 +185,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function getElementAt(index:int):IChild
{
[07/16] git commit: [flex-asjs] [refs/heads/feature/chart-work] -
Bring back MDLDynamicTabsExample - it seems to be working now
Posted by pi...@apache.org.
Bring back MDLDynamicTabsExample - it seems to be working now
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bea3e945
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bea3e945
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bea3e945
Branch: refs/heads/feature/chart-work
Commit: bea3e94561e08cf6dd2a76abbc44e27ee622092a
Parents: 208b642
Author: piotrz <pi...@apache.org>
Authored: Sat Mar 25 00:33:40 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Sat Mar 25 00:33:40 2017 +0100
----------------------------------------------------------------------
examples/flexjs/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bea3e945/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index 328cae1..0831f2f 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -52,8 +52,8 @@
<module>HelloWorld</module>
<module>ListExample</module>
<module>MapSearch</module>
- <!--module>MDLBlogExample</module>
- <module>MDLDynamicTabsExample</module-->
+ <!--module>MDLBlogExample</module>-->
+ <module>MDLDynamicTabsExample</module>
<module>MDLExample</module>
<module>MobileMap</module>
<module>MobileStocks</module>