You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2017/01/04 02:18:43 UTC
[01/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Add Object type to avoid warning in compilation
Repository: flex-asjs
Updated Branches:
refs/heads/feature/fontawesome d875d2f43 -> e17a8ff3c
Add Object type to avoid warning in compilation
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c854826f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c854826f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c854826f
Branch: refs/heads/feature/fontawesome
Commit: c854826f32f21eacb3abed8676d9ca19d9efed3c
Parents: 8263756
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Dec 28 02:17:02 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Dec 28 02:17:02 2016 +0100
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/Snackbar.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c854826f/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
index 51b104a..2d614c6 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
@@ -171,7 +171,7 @@ package org.apache.flex.mdl
{
if (snackbar)
{
- var snackbarData = {
+ var snackbarData:Object = {
message: _message,
timeout: _timeout,
actionHandler: onActionHandler,
[30/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - If
Bindable property is assigned to component itself ItemRendererSimpleBinding
throws exception - example of such binding can be find:
\examples\flexjs\MDLExample\src\main\flex\itemRender
Posted by bi...@apache.org.
If Bindable property is assigned to component itself ItemRendererSimpleBinding throws exception - example of such binding can be find: \examples\flexjs\MDLExample\src\main\flex\itemRenderers\CustomMenuItemRenderer.mxml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/59223444
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/59223444
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/59223444
Branch: refs/heads/feature/fontawesome
Commit: 59223444ed48d4b15d996919ba5925613db06f03
Parents: 6642ca7
Author: piotrz <pi...@apache.org>
Authored: Tue Jan 3 14:09:40 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Tue Jan 3 14:09:40 2017 +0100
----------------------------------------------------------------------
.../org/apache/flex/binding/ItemRendererSimpleBinding.as | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/59223444/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererSimpleBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererSimpleBinding.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererSimpleBinding.as
index 5354a8c..889a218 100644
--- a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererSimpleBinding.as
+++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererSimpleBinding.as
@@ -144,7 +144,14 @@ public class ItemRendererSimpleBinding implements IBead, IDocument
private function dataChangeHandler(event:Event):void
{
- document[destinationID][destinationPropertyName] = document.data[sourcePropertyName];
+ if (destinationID == "this")
+ {
+ document[destinationPropertyName] = document.data[sourcePropertyName];
+ }
+ else
+ {
+ document[destinationID][destinationPropertyName] = document.data[sourcePropertyName];
+ }
}
}
[28/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Fix Binding for MDL Menu - make Bindable each property in MenuItemVO
Posted by bi...@apache.org.
Fix Binding for MDL Menu - make Bindable each property in MenuItemVO
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d6dec081
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d6dec081
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d6dec081
Branch: refs/heads/feature/fontawesome
Commit: d6dec081d0bde3f5308a43876732fc6ed55cd9b3
Parents: 5753652
Author: piotrz <pi...@apache.org>
Authored: Tue Jan 3 13:37:03 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Tue Jan 3 13:37:03 2017 +0100
----------------------------------------------------------------------
.../itemRenderers/CustomMenuItemRenderer.mxml | 5 ++-
.../src/main/flex/models/MenuModel.as | 3 +-
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 36 +++-----------------
3 files changed, 8 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d6dec081/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
index 90e3dc2..c090660 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
@@ -19,8 +19,7 @@ limitations under the License.
-->
<mdl:MenuItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
- xmlns:binding="org.apache.flex.binding.*"
- divider="{menuItem.hasDivider}">
+ xmlns:binding="org.apache.flex.binding.*">
<mdl:beads>
<binding:ItemRendererDataBinding />
<mdl:Disabled disabled="{menuItem.disabled}"/>
@@ -28,7 +27,7 @@ limitations under the License.
<fx:Script><![CDATA[
import vos.MenuItemVO;
- [Bindable("__NoChangeEvent__")]
+ [Bindable("dataChange")]
public function get menuItem():MenuItemVO
{
return data as MenuItemVO;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d6dec081/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
index a883130..9faa83e 100644
--- a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
+++ b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
@@ -28,7 +28,8 @@ package models
private var _menuItems:Array = [
new MenuItemVO("Some Action"),
new MenuItemVO("Another Action", true),
- new MenuItemVO("More Action", false, false)
+ new MenuItemVO("More Action"),
+ new MenuItemVO("Item Disabled", false, true)
];
public function get menuItems():Array
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d6dec081/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
index ce8226c..3fc48f0 100644
--- a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -18,48 +18,20 @@
////////////////////////////////////////////////////////////////////////////////
package vos
{
- [Bindable]
public class MenuItemVO
{
+ [Bindable]
public var label:String;
+ [Bindable]
public var disabled:Boolean;
+ [Bindable]
public var hasDivider:Boolean;
- public function MenuItemVO(label:String, hasDivider:Boolean = false, disabled:Boolean = true)
+ public function MenuItemVO(label:String, hasDivider:Boolean = false, disabled:Boolean = false)
{
this.label = label;
this.hasDivider = hasDivider;
this.disabled = disabled;
}
-
- /* public function get label():String
- {
- return _label;
- }
-
- public function set label(value:String):void
- {
- _label = value;
- }
-
- public function get disabled():Boolean
- {
- return _disabled;
- }
-
- public function set disabled(value:Boolean):void
- {
- _disabled = value;
- }
-
- public function get hasDivider():Boolean
- {
- return _hasDivider;
- }
-
- public function set hasDivider(value:Boolean):void
- {
- _hasDivider = value;
- } */
}
}
[08/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Remove warrnings related to wrong namespaces in MDL example
Posted by bi...@apache.org.
Remove warrnings related to wrong namespaces in MDL example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8e1c82fc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8e1c82fc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8e1c82fc
Branch: refs/heads/feature/fontawesome
Commit: 8e1c82fcef4ae9c6e4194de474e1c326c3baa843
Parents: 05d7456
Author: piotrz <pi...@apache.org>
Authored: Thu Dec 29 19:11:52 2016 +0100
Committer: piotrz <pi...@apache.org>
Committed: Thu Dec 29 19:11:52 2016 +0100
----------------------------------------------------------------------
.../flexjs/MDLExample/src/main/flex/Cards.mxml | 8 +++----
.../src/main/flex/MainNavigation.mxml | 4 ++--
.../MDLExample/src/main/flex/Sliders.mxml | 1 -
.../MDLExample/src/main/flex/TextFields.mxml | 16 ++++++-------
.../ActorNameAndIconListItemRenderer.mxml | 8 +++----
.../ActorNameListItemRenderer.mxml | 4 ++--
.../AvatarAndActionListItemRenderer.mxml | 12 +++++-----
...vatarAndActionThreeLineListItemRenderer.mxml | 20 ++++++++--------
.../AvatarAndActionTwoLineListItemRenderer.mxml | 24 ++++++++++----------
.../itemRenderers/CustomListItemRenderer.mxml | 4 ++--
10 files changed, 50 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
index afb3a82..db0eee1 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
@@ -29,11 +29,11 @@ limitations under the License.
<mdl:CardTitleText text="Welcome"/>
</mdl:CardTitle>
<mdl:CardSupportingText>
- <js:beads>
+ <mdl:beads>
<js:InnerHTML>
<![CDATA[Lorem ipsum dolor sit <b>amet</b>, consectetur <i>adipiscing elit</i>. Mauris sagittis pellentesque lacus eleifend lacinia...]]>
</js:InnerHTML>
- </js:beads>
+ </mdl:beads>
</mdl:CardSupportingText>
<mdl:CardActions border="true">
<mdl:Button text="Get Started" ripple="true" colored="true"/>
@@ -70,11 +70,11 @@ limitations under the License.
<mdl:Card className="demo-card-event" shadow="2">
<mdl:CardTitle expand="true">
<mdl:CardTitleText>
- <js:beads>
+ <mdl:beads>
<js:InnerHTML>
<![CDATA[<h4>Featured event:<br>May 24, 2016<br>7-11pm</h4>]]>
</js:InnerHTML>
- </js:beads>
+ </mdl:beads>
</mdl:CardTitleText>
</mdl:CardTitle>
<mdl:CardActions border="true">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
index e93cc70..ec59a33 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -124,9 +124,9 @@ limitations under the License.
<mdl:MenuItem text="Some Action"/>
<mdl:MenuItem text="Another Action"/>
<mdl:MenuItem text="Action Disabled">
- <js:beads>
+ <mdl:beads>
<mdl:Disabled/>
- </js:beads>
+ </mdl:beads>
</mdl:MenuItem>
<mdl:MenuItem text="More Action" divider="true"/>
<mdl:MenuItem text="Separated Action"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
index bc8fead..fc9726d 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
@@ -18,7 +18,6 @@ limitations under the License.
-->
<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
initComplete="initTextBoxes(event)">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
index c46e8a4..7c9b601 100644
--- a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
@@ -27,30 +27,30 @@ limitations under the License.
<!-- Text Fields :: https://getmdl.io/components/index.html#textfields-section -->
<js:Form action="#">
<mdl:TextField id="mdlti" change="mdlfloatingti.text = mdlti.text">
- <js:beads>
+ <mdl:beads>
<mdl:TextPrompt prompt="Normal Text Field..."/>
- </js:beads>
+ </mdl:beads>
</mdl:TextField>
</js:Form>
<mdl:TextField id="mdlfloatingti" floatingLabel= "true">
- <js:beads>
+ <mdl:beads>
<mdl:TextPrompt prompt="Floating Label"/>
- </js:beads>
+ </mdl:beads>
</mdl:TextField>
<mdl:TextField>
- <js:beads>
+ <mdl:beads>
<mdl:TextPrompt prompt="Letters and spaces..."/>
<mdl:Restrict pattern="[A-Z,a-z, ]*" error="Letters and spaces only"/>
- </js:beads>
+ </mdl:beads>
</mdl:TextField>
<mdl:TextField floatingLabel="true">
- <js:beads>
+ <mdl:beads>
<mdl:TextPrompt prompt="Numbers..."/>
<mdl:Restrict pattern="-?[0-9]*(\.[0-9]+)?" error="Input is not a number!"/>
- </js:beads>
+ </mdl:beads>
</mdl:TextField>
</mdl:Grid>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
index 67a22bd..5d93ae0 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
@@ -34,14 +34,14 @@ limitations under the License.
]]>
</fx:Script>
- <js:beads>
+ <mdl:beads>
<js:ItemRendererDataBinding />
- </js:beads>
+ </mdl:beads>
<js:Span text="{actor.actorName}">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemPrimaryContent/>
- </mdl:beads>
+ </js:beads>
<mdl:MaterialIconPerson listItemIcon="true"/>
</js:Span>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameListItemRenderer.mxml
index 4092bf7..e8a9978 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameListItemRenderer.mxml
@@ -34,9 +34,9 @@ limitations under the License.
]]>
</fx:Script>
- <js:beads>
+ <mdl:beads>
<js:ItemRendererDataBinding />
- </js:beads>
+ </mdl:beads>
<js:Span text="{actor.actorName}">
<js:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
index 6f932c9..8f39bad 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
@@ -34,20 +34,20 @@ limitations under the License.
]]>
</fx:Script>
- <js:beads>
+ <mdl:beads>
<js:ItemRendererDataBinding />
- </js:beads>
+ </mdl:beads>
<js:Span text="{actor.actorName}">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemPrimaryContent/>
- </mdl:beads>
+ </js:beads>
<mdl:MaterialIconPerson listItemAvatar="true"/>
</js:Span>
<js:A href="#">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemSecondaryAction/>
- </mdl:beads>
+ </js:beads>
<mdl:MaterialIconStar/>
</js:A>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
index 1193d91..0c82b89 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
@@ -35,31 +35,31 @@ limitations under the License.
]]>
</fx:Script>
- <js:beads>
+ <mdl:beads>
<js:ItemRendererDataBinding />
- </js:beads>
+ </mdl:beads>
<js:Span>
- <mdl:beads>
+ <js:beads>
<mdl:ListItemPrimaryContent/>
- </mdl:beads>
+ </js:beads>
<mdl:MaterialIconPerson listItemAvatar="true"/>
<js:Span text="{actor.actorName}"/>
<js:Span text="{actor.description}">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemTextBody/>
- </mdl:beads>
+ </js:beads>
</js:Span>
</js:Span>
<js:Span>
- <mdl:beads>
+ <js:beads>
<mdl:ListItemSecondaryContent/>
- </mdl:beads>
+ </js:beads>
<js:A href="#">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemSecondaryAction/>
- </mdl:beads>
+ </js:beads>
<mdl:MaterialIconStar/>
</js:A>
</js:Span>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
index 9f3e577..40b54f5 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
@@ -42,36 +42,36 @@ limitations under the License.
]]>
</fx:Script>
- <js:beads>
+ <mdl:beads>
<js:ItemRendererDataBinding />
- </js:beads>
+ </mdl:beads>
<js:Span>
- <mdl:beads>
+ <js:beads>
<mdl:ListItemPrimaryContent/>
<mdl:MaterialIconPerson listItemAvatar="true"/>
- </mdl:beads>
+ </js:beads>
<js:Span text="{actor.actorName}"/>
<js:Span text="{actor.episodes}">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemSubTitle/>
- </mdl:beads>
+ </js:beads>
</js:Span>
</js:Span>
<js:Span>
- <mdl:beads>
+ <js:beads>
<mdl:ListItemSecondaryContent/>
- </mdl:beads>
+ </js:beads>
<js:Span id="ir" visible="false" text="Actor">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemSecondaryInfo/>
- </mdl:beads>
+ </js:beads>
</js:Span>
<js:A href="#">
- <mdl:beads>
+ <js:beads>
<mdl:ListItemSecondaryAction/>
- </mdl:beads>
+ </js:beads>
<mdl:MaterialIconStar/>
</js:A>
</js:Span>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e1c82fc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
index 79eb40c..5d4b55c 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
@@ -34,9 +34,9 @@ limitations under the License.
]]>
</fx:Script>
- <js:beads>
+ <mdl:beads>
<js:ItemRendererDataBinding />
- </js:beads>
+ </mdl:beads>
<js:Span text="{data.label}">
<js:beads>
[12/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Introducing MDL TextArea (with rows),
refactoring textfield beads to allow TextArea and reworking the TextFields
Example layout and inserting some TextArea controls to test
Posted by bi...@apache.org.
Introducing MDL TextArea (with rows), refactoring textfield beads to allow TextArea and reworking the TextFields Example layout and inserting some TextArea controls to test
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bcc09532
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bcc09532
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bcc09532
Branch: refs/heads/feature/fontawesome
Commit: bcc09532f39deef719a6be29d4427a1763f0819c
Parents: 48ba825
Author: Carlos Rovira <ca...@apache.org>
Authored: Sun Jan 1 18:48:20 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sun Jan 1 18:48:20 2017 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/TextFields.mxml | 72 ++++---
.../main/flex/org/apache/flex/mdl/TextArea.as | 205 +++++++++++++++++++
.../main/flex/org/apache/flex/mdl/TextField.as | 4 +-
.../flex/org/apache/flex/mdl/beads/Restrict.as | 7 +-
.../org/apache/flex/mdl/beads/TextPrompt.as | 4 +-
.../flex/mdl/supportClasses/ITextField.as | 71 +++++++
.../src/main/resources/mdl-manifest.xml | 1 +
7 files changed, 325 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bcc09532/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
index e53faaf..acac84b 100644
--- a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
@@ -22,51 +22,57 @@ limitations under the License.
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml">
- <mdl:Grid>
+ <mdl:Grid width="300">
<!-- Text Fields :: https://getmdl.io/components/index.html#textfields-section -->
<js:Form action="#">
- <mdl:TextField id="mdlti" change="mdlfloatingti.text = mdlti.text">
+
+ <mdl:TextField id="mdlti" change="mdlfloatingti.text = mdlti.text" width="100%">
<mdl:beads>
<mdl:TextPrompt prompt="Normal Text Field..."/>
</mdl:beads>
</mdl:TextField>
- </js:Form>
- <mdl:TextField id="mdlfloatingti" floatingLabel= "true">
- <mdl:beads>
- <mdl:TextPrompt prompt="Floating Label"/>
- </mdl:beads>
- </mdl:TextField>
+ <mdl:TextField id="mdlfloatingti" floatingLabel= "true" width="100%">
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Floating Label"/>
+ </mdl:beads>
+ </mdl:TextField>
- <mdl:TextField>
- <mdl:beads>
- <mdl:TextPrompt prompt="Letters and spaces..."/>
- <mdl:Restrict pattern="[A-Z,a-z, ]*" error="Letters and spaces only"/>
- </mdl:beads>
- </mdl:TextField>
+ <mdl:TextField width="100%">
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Letters and spaces..."/>
+ <mdl:Restrict pattern="[A-Z,a-z, ]*" error="Letters and spaces only"/>
+ </mdl:beads>
+ </mdl:TextField>
- <mdl:TextField floatingLabel="true">
- <mdl:beads>
- <mdl:TextPrompt prompt="Numbers..."/>
- <mdl:Restrict pattern="-?[0-9]*(\.[0-9]+)?" error="Input is not a number!"/>
- </mdl:beads>
- </mdl:TextField>
+ <mdl:TextField floatingLabel="true" width="100%">
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Numbers..."/>
+ <mdl:Restrict pattern="-?[0-9]*(\.[0-9]+)?" error="Input is not a number!"/>
+ </mdl:beads>
+ </mdl:TextField>
- <mdl:TextField>
- <mdl:beads>
- <mdl:TextPrompt prompt="Expandible..."/>
- <mdl:ExpandableSearch/>
- </mdl:beads>
- </mdl:TextField>
+ <mdl:TextField width="100%">
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Expandible..."/>
+ <mdl:ExpandableSearch/>
+ </mdl:beads>
+ </mdl:TextField>
- <mdl:TextField>
- <mdl:beads>
- <mdl:TextPrompt prompt="Expandible..."/>
- <mdl:ExpandableSearch/>
- </mdl:beads>
- </mdl:TextField>
-
+ <mdl:TextArea width="100%">
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Text lines..."/>
+ </mdl:beads>
+ </mdl:TextArea>
+
+ <mdl:TextArea floatingLabel="true" width="100%" rows="5">
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Text lines, floating and only letters..."/>
+ <mdl:Restrict pattern="[A-Z,a-z, ]*" error="Letters and spaces only"/>
+ </mdl:beads>
+ </mdl:TextArea>
+ </js:Form>
</mdl:Grid>
</mdl:TabBarPanel>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bcc09532/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
new file mode 100644
index 0000000..dda2668
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
@@ -0,0 +1,205 @@
+//
+// 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.mdl
+{
+ import org.apache.flex.events.Event;
+ import org.apache.flex.html.TextInput;
+
+ import org.apache.flex.mdl.supportClasses.ITextField;
+
+ COMPILE::JS
+ {
+ import goog.events;
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The TextArea class provides a Material Design Library UI-like appearance for
+ * a TextField with multiple lines
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class TextArea extends org.apache.flex.html.TextInput implements ITextField
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function TextArea()
+ {
+ super();
+
+ className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ }
+
+ private var _rows:int = 2;
+ /**
+ * The number of rows in the textarea. Defaults to 2
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get rows():int
+ {
+ return _rows;
+ }
+ public function set rows(value:int):void
+ {
+ _rows = value;
+
+ COMPILE::JS
+ {
+ input.setAttribute('rows', _rows);
+ }
+ }
+
+ COMPILE::JS
+ {
+ private var _textNode:Text;
+
+ public function get textNode():Text
+ {
+ return _textNode;
+ }
+
+ public function set textNode(value:Text):void
+ {
+ _textNode = value;
+ }
+
+ private var _input:HTMLInputElement;
+
+ public function get input():HTMLInputElement
+ {
+ return _input;
+ }
+
+ public function set input(value:HTMLInputElement):void
+ {
+ _input = value;
+ }
+
+ private var _label:HTMLLabelElement;
+
+ public function get label():HTMLLabelElement
+ {
+ return _label;
+ }
+
+ public function set label(value:HTMLLabelElement):void
+ {
+ _label = value;
+ }
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion HTMLDivElement
+ * @flexjsignorecoercion HTMLInputElement
+ * @flexjsignorecoercion HTMLLabelElement
+ * @flexjsignorecoercion Text
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ typeNames = "mdl-textfield mdl-js-textfield";
+
+ var div:HTMLDivElement = document.createElement('div') as HTMLDivElement;
+ div.className = typeNames;
+
+ input = document.createElement('textarea') as HTMLInputElement;
+ input.setAttribute('type', 'text');
+ input.setAttribute('rows', rows);
+ input.className = "mdl-textfield__input";
+
+ //attach input handler to dispatch flexjs change event when user write in textinput
+ //goog.events.listen(element, 'change', killChangeHandler);
+ goog.events.listen(input, 'input', textChangeHandler);
+
+ label = document.createElement('label') as HTMLLabelElement;
+ label.className = "mdl-textfield__label";
+
+ textNode = document.createTextNode('') as Text;
+ label.appendChild(textNode);
+
+ div.appendChild(input);
+ div.appendChild(label);
+
+ element = input as WrappedHTMLElement;
+
+ positioner = div as WrappedHTMLElement;
+ (input as WrappedHTMLElement).flexjs_wrapper = this;
+ (label as WrappedHTMLElement).flexjs_wrapper = this;
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+
+ private var _className:String;
+
+ /**
+ * since we have a div surronding the main input, we need to
+ * route the class assignaments to div
+ */
+ override public function set className(value:String):void
+ {
+ if (_className != value)
+ {
+ COMPILE::JS
+ {
+ positioner.className = typeNames ? value + ' ' + typeNames : value;
+ }
+ _className = value;
+ dispatchEvent(new Event("classNameChanged"));
+ }
+ }
+
+ private var _floatingLabel:Boolean = false;
+ /**
+ * A boolean flag to activate "mdl-textfield--floating-label" effect selector.
+ * Applies floating label effect.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get floatingLabel():Boolean
+ {
+ return _floatingLabel;
+ }
+ public function set floatingLabel(value:Boolean):void
+ {
+ _floatingLabel = value;
+
+ COMPILE::JS
+ {
+ positioner.classList.toggle("mdl-textfield--floating-label", _floatingLabel);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bcc09532/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
index 8b43101..dba1384 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
@@ -20,6 +20,8 @@ package org.apache.flex.mdl
import org.apache.flex.events.Event;
import org.apache.flex.html.TextInput;
+ import org.apache.flex.mdl.supportClasses.ITextField;
+
COMPILE::JS
{
import goog.events;
@@ -35,7 +37,7 @@ package org.apache.flex.mdl
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class TextField extends org.apache.flex.html.TextInput
+ public class TextField extends org.apache.flex.html.TextInput implements ITextField
{
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bcc09532/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Restrict.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Restrict.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Restrict.as
index 7acbba7..d9a08d8 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Restrict.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Restrict.as
@@ -20,8 +20,9 @@ package org.apache.flex.mdl.beads
{
import org.apache.flex.core.IBead;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.UIBase;
- import org.apache.flex.mdl.TextField;
+ import org.apache.flex.mdl.supportClasses.ITextField;
/**
* The Restrict bead class is a specialty bead that can be used with
@@ -113,7 +114,7 @@ package org.apache.flex.mdl.beads
COMPILE::JS
{
- var mdlTi:TextField = value as TextField;
+ var mdlTi:ITextField = value as ITextField;
mdlTi.input.setAttribute('pattern', pattern);
var span:HTMLSpanElement = document.createElement('span') as HTMLSpanElement;
@@ -122,7 +123,7 @@ package org.apache.flex.mdl.beads
var spanTextNode:Text = document.createTextNode(error) as Text;
span.appendChild(spanTextNode);
- mdlTi.positioner.appendChild(span);
+ UIBase(mdlTi).positioner.appendChild(span);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bcc09532/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
index 0e5904a..413892a 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
@@ -31,7 +31,7 @@ package org.apache.flex.mdl.beads
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.mdl.TextField;
+ import org.apache.flex.mdl.supportClasses.ITextField;
/**
* The TextPrompt class is a specialty bead that can be used with
@@ -116,7 +116,7 @@ package org.apache.flex.mdl.beads
}
COMPILE::JS
{
- var mdlTi:TextField = value as TextField;
+ var mdlTi:ITextField = value as ITextField;
mdlTi.textNode.nodeValue = prompt;
//var e:HTMLInputElement = host.element as HTMLInputElement;
//e.placeholder = prompt;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bcc09532/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ITextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ITextField.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ITextField.as
new file mode 100644
index 0000000..d2adbf7
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ITextField.as
@@ -0,0 +1,71 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.supportClasses
+{
+ /**
+ * The IMdlColor interface must be implemented by any class that
+ * will apply color and colorWeight provided by google style color.
+ *
+ * https://material.google.com/style/color.html#color-color-palette
+ * https://gitlab.com/material/colors/blob/master/colors.html
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface ITextField
+ {
+ COMPILE::JS
+ {
+ /**
+ * the textNode
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get textNode():Text;
+ function set textNode(value:Text):void;
+
+ /**
+ * the input
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get input():HTMLInputElement;
+ function set input(value:HTMLInputElement):void;
+
+ /**
+ * the label
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get label():HTMLLabelElement;
+ function set label(value:HTMLLabelElement):void;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bcc09532/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index 8d6dd57..601d787 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -23,6 +23,7 @@
<component id="Button" class="org.apache.flex.mdl.Button"/>
<component id="TextField" class="org.apache.flex.mdl.TextField"/>
+ <component id="TextArea" class="org.apache.flex.mdl.TextArea"/>
<component id="CheckBox" class="org.apache.flex.mdl.CheckBox"/>
<component id="RadioButton" class="org.apache.flex.mdl.RadioButton"/>
<component id="Switch" class="org.apache.flex.mdl.Switch"/>
[37/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Merge branch 'develop' into feature/fontawesome
Posted by bi...@apache.org.
Merge branch 'develop' into feature/fontawesome
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/70980a81
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/70980a81
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/70980a81
Branch: refs/heads/feature/fontawesome
Commit: 70980a819ae5d34f520fd1da348af17a6769a3d9
Parents: d875d2f a115c71
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Tue Jan 3 17:54:03 2017 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Tue Jan 3 17:54:03 2017 -0800
----------------------------------------------------------------------
examples/flexjs/MDLExample/build.xml | 63 ++++++
.../MDLExample/src/main/flex/Buttons.mxml | 78 ++++----
.../flexjs/MDLExample/src/main/flex/Cards.mxml | 23 +--
.../flexjs/MDLExample/src/main/flex/Grids.mxml | 59 +++---
.../src/main/flex/MainNavigation.mxml | 38 ++--
.../flexjs/MDLExample/src/main/flex/Menus.mxml | 45 +++++
.../MDLExample/src/main/flex/Sliders.mxml | 87 +++++++++
.../MDLExample/src/main/flex/Snackbar.mxml | 24 ++-
.../MDLExample/src/main/flex/TextFields.mxml | 84 +++++---
.../ActorNameAndIconListItemRenderer.mxml | 8 +-
.../ActorNameListItemRenderer.mxml | 4 +-
.../AvatarAndActionListItemRenderer.mxml | 12 +-
...vatarAndActionThreeLineListItemRenderer.mxml | 20 +-
.../AvatarAndActionTwoLineListItemRenderer.mxml | 24 +--
.../itemRenderers/CustomListItemRenderer.mxml | 6 +-
.../itemRenderers/CustomMenuItemRenderer.mxml | 37 ++++
.../src/main/flex/models/MenuModel.as | 40 ++++
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 37 ++++
.../main/resources/mdl-js-index-template.html | 4 +-
.../src/main/resources/mdl-styles.css | 18 +-
.../js/FlexJS/projects/ExpressJS/build.xml | 142 ++++++++++++++
.../src/main/config/compile-js-config.xml | 92 +++++++++
.../flex/binding/ItemRendererSimpleBinding.as | 9 +-
.../flex/org/apache/flex/core/IStyleObject.as | 2 -
frameworks/projects/Express/build.xml | 116 +++++++++++
frameworks/projects/Express/pom.xml | 128 +++++++++++++
.../src/main/config/compile-as-config.xml | 82 ++++++++
.../Express/src/main/flex/ExpressClasses.as | 42 ++++
.../flex/org/apache/flex/express/Application.as | 37 ++++
.../flex/org/apache/flex/express/Container.as | 40 ++++
.../flex/org/apache/flex/express/HContainer.as | 36 ++++
.../main/flex/org/apache/flex/express/HView.as | 36 ++++
.../org/apache/flex/express/MXMLItemRenderer.as | 37 ++++
.../flex/org/apache/flex/express/VContainer.as | 36 ++++
.../main/flex/org/apache/flex/express/VView.as | 36 ++++
.../main/flex/org/apache/flex/express/View.as | 37 ++++
.../Express/src/main/resources/defaults.css | 58 ++++++
.../src/main/resources/express-manifest.xml | 33 ++++
.../main/flex/org/apache/flex/core/UIBase.as | 3 +-
.../src/main/flex/org/apache/flex/html/Div.as | 51 ++---
.../src/main/flex/org/apache/flex/html/Span.as | 2 +-
.../src/main/flex/MDLClasses.as | 4 +-
.../src/main/flex/org/apache/flex/mdl/Footer.as | 106 ++++++++++
.../org/apache/flex/mdl/FooterLeftSection.as | 107 +++++++++++
.../org/apache/flex/mdl/FooterRightSection.as | 107 +++++++++++
.../src/main/flex/org/apache/flex/mdl/Menu.as | 111 ++++++++---
.../main/flex/org/apache/flex/mdl/MenuItem.as | 158 ---------------
.../src/main/flex/org/apache/flex/mdl/Slider.as | 40 +---
.../main/flex/org/apache/flex/mdl/Snackbar.as | 159 +--------------
.../src/main/flex/org/apache/flex/mdl/TBody.as | 98 ----------
.../src/main/flex/org/apache/flex/mdl/THead.as | 3 +-
.../flex/org/apache/flex/mdl/TabBarButton.as | 7 +-
.../src/main/flex/org/apache/flex/mdl/Table.as | 2 +-
.../main/flex/org/apache/flex/mdl/TextArea.as | 146 ++++++++++++++
.../main/flex/org/apache/flex/mdl/TextField.as | 78 +-------
.../src/main/flex/org/apache/flex/mdl/Toast.as | 172 +++++++++++++++++
.../org/apache/flex/mdl/beads/ContactChip.as | 5 -
.../apache/flex/mdl/beads/ContactImageChip.as | 1 -
.../flex/org/apache/flex/mdl/beads/Disabled.as | 25 ++-
.../apache/flex/mdl/beads/ExpandableSearch.as | 111 +++++++++++
.../flex/mdl/beads/ListItemPrimaryContent.as | 5 -
.../flex/mdl/beads/ListItemSecondaryAction.as | 5 -
.../flex/mdl/beads/ListItemSecondaryContent.as | 5 -
.../flex/mdl/beads/ListItemSecondaryInfo.as | 5 -
.../apache/flex/mdl/beads/ListItemSubTitle.as | 5 -
.../apache/flex/mdl/beads/ListItemTextBody.as | 5 -
.../flex/org/apache/flex/mdl/beads/Restrict.as | 7 +-
.../apache/flex/mdl/beads/SliderTrackView.as | 1 -
.../org/apache/flex/mdl/beads/TextPrompt.as | 73 ++++---
.../flex/org/apache/flex/mdl/beads/Tooltip.as | 6 -
.../beads/controllers/SliderMouseController.as | 126 ++++++------
.../flex/mdl/beads/models/ISnackbarModel.as | 28 +++
.../apache/flex/mdl/beads/models/IToastModel.as | 32 ++++
.../flex/mdl/beads/models/SnackbarModel.as | 66 +++++++
.../apache/flex/mdl/beads/models/ToastModel.as | 69 +++++++
.../org/apache/flex/mdl/beads/views/ListView.as | 1 -
.../apache/flex/mdl/beads/views/SliderView.as | 127 ++++--------
.../flex/mdl/itemRenderers/MenuItemRenderer.as | 191 +++++++++++++++++++
.../MaterialIconKeyboardArrowDown.as | 52 +++++
.../mdl/materialIcons/MaterialIconSearch.as | 52 +++++
.../flex/mdl/materialIcons/MaterialIconsType.as | 2 +
.../flex/mdl/supportClasses/ITextField.as | 71 +++++++
.../ItemRendererFactoryForArrayData.as | 178 -----------------
.../flex/mdl/supportClasses/TextFieldBase.as | 162 ++++++++++++++++
.../src/main/resources/defaults.css | 35 +++-
.../src/main/resources/mdl-manifest.xml | 31 ++-
86 files changed, 3379 insertions(+), 1167 deletions(-)
----------------------------------------------------------------------
[31/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Add divider in MDL CustomMenuItemRenderer
Posted by bi...@apache.org.
Add divider in MDL CustomMenuItemRenderer
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ffd738dc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ffd738dc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ffd738dc
Branch: refs/heads/feature/fontawesome
Commit: ffd738dcea78ea031512a214e6d4e507e82b7604
Parents: 5922344
Author: piotrz <pi...@apache.org>
Authored: Tue Jan 3 14:14:03 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Tue Jan 3 14:14:03 2017 +0100
----------------------------------------------------------------------
.../src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ffd738dc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
index c090660..23b8f6a 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
@@ -19,7 +19,8 @@ limitations under the License.
-->
<mdl:MenuItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
- xmlns:binding="org.apache.flex.binding.*">
+ xmlns:binding="org.apache.flex.binding.*"
+ divider="{menuItem.hasDivider}">
<mdl:beads>
<binding:ItemRendererDataBinding />
<mdl:Disabled disabled="{menuItem.disabled}"/>
[16/38] flex-asjs git commit: Solve a bug in change text field that was not removing prompt. But must be revisited since this should be handled through model and not directly from component, but model is missing when queried…
Posted by bi...@apache.org.
Solve a bug in change text field that was not removing prompt. But must be revisited since this should be handled through model and not directly from component, but model is missing when queried\u2026
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fadd9f0a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fadd9f0a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fadd9f0a
Branch: refs/heads/feature/fontawesome
Commit: fadd9f0a2d3d039383f1d21f55c7c39e392ca51a
Parents: 81bf74d
Author: Carlos Rovira <ca...@apache.org>
Authored: Sun Jan 1 20:39:06 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sun Jan 1 20:39:06 2017 +0100
----------------------------------------------------------------------
.../org/apache/flex/mdl/beads/TextPrompt.as | 71 ++++++++++++++------
.../src/main/resources/defaults.css | 14 ++++
2 files changed, 63 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fadd9f0a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
index 413892a..31178b6 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TextPrompt.as
@@ -32,6 +32,7 @@ package org.apache.flex.mdl.beads
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.mdl.supportClasses.ITextField;
+ import org.apache.flex.mdl.supportClasses.TextFieldBase;
/**
* The TextPrompt class is a specialty bead that can be used with
@@ -92,15 +93,15 @@ package org.apache.flex.mdl.beads
{
_strand = value;
+ //var model:Object = UIBase(_strand).model;
+ // listen for changes in text to hide or show the prompt
+ //if (!model.hasOwnProperty("text")) {
+ // throw new Error("Model requires a text property when used with TextPromptBead");
+ //}
+ IEventDispatcher(UIBase(_strand)).addEventListener("textChange", handleTextChange);
+
COMPILE::SWF
{
- // listen for changes in text to hide or show the prompt
- var model:Object = UIBase(_strand).model;
- if (!model.hasOwnProperty("text")) {
- throw new Error("Model requires a text property when used with TextPromptBead");
- }
- IEventDispatcher(model).addEventListener("textChange", handleTextChange);
-
// create a TextField that displays the prompt - it shows
// and hides based on the model's content
promptField = new CSSTextField();
@@ -114,37 +115,63 @@ package org.apache.flex.mdl.beads
// trigger the event handler to display if needed
handleTextChange(null);
}
+
COMPILE::JS
{
- var mdlTi:ITextField = value as ITextField;
+ mdlTi = value as ITextField;
mdlTi.textNode.nodeValue = prompt;
+
//var e:HTMLInputElement = host.element as HTMLInputElement;
//e.placeholder = prompt;
}
}
+ private var promptAdded:Boolean;
+
+ COMPILE::JS
+ private var mdlTi:ITextField;
+
COMPILE::SWF
private var promptField:CSSTextField;
- private var promptAdded:Boolean;
+
/**
* @private
*/
- COMPILE::SWF
private function handleTextChange( event:Event ):void
- {
- // see what the model currently has to determine if the prompt should be
- // displayed or not.
- var model:Object = UIBase(_strand).model;
-
- if (model.text != null && model.text.length > 0 ) {
- if (promptAdded) UIBase(_strand).$displayObjectContainer.removeChild(promptField);
- promptAdded = false;
+ {
+ COMPILE::SWF
+ {
+ // see what the model currently has to determine if the prompt should be
+ // displayed or not.
+ var model:Object = UIBase(_strand).model;
+
+ if (model.text != null && model.text.length > 0 ) {
+ if (promptAdded) UIBase(_strand).$displayObjectContainer.removeChild(promptField);
+ promptAdded = false;
+ }
+ else {
+ if (!promptAdded) UIBase(_strand).$displayObjectContainer.addChild(promptField);
+ promptField.text = prompt;
+ promptAdded = true;
+ }
}
- else {
- if (!promptAdded) UIBase(_strand).$displayObjectContainer.addChild(promptField);
- promptField.text = prompt;
- promptAdded = true;
+
+ COMPILE::JS
+ {
+ // see what the model currently has to determine if the prompt should be
+ // displayed or not.
+ var model:Object = UIBase(_strand).model;
+
+ if (TextFieldBase(mdlTi).text != null && TextFieldBase(mdlTi).text.length > 0 )
+ {
+ mdlTi.textNode.nodeValue = "";
+ }
+ else
+ {
+ mdlTi.textNode.nodeValue = prompt;
+ }
+
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fadd9f0a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 1ebf7dc..681d838 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -20,6 +20,20 @@
@namespace "library://ns.apache.org/flexjs/mdl";
+TextField
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ /*IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");*/
+}
+
+TextArea
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ /*IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");*/
+}
+
CheckBox
{
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
[14/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Fix prompt in expandable search, rework buttons layout
Posted by bi...@apache.org.
Fix prompt in expandable search, rework buttons 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/37248573
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/37248573
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/37248573
Branch: refs/heads/feature/fontawesome
Commit: 37248573757f4da60939c1ad71342068be79b8fc
Parents: b31b86f
Author: Carlos Rovira <ca...@apache.org>
Authored: Sun Jan 1 19:49:25 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sun Jan 1 19:49:25 2017 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/Buttons.mxml | 74 ++++++++------------
.../MDLExample/src/main/flex/TextFields.mxml | 7 ++
.../apache/flex/mdl/beads/ExpandableSearch.as | 1 -
3 files changed, 38 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37248573/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
index 93c3fd4..0be4e70 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
@@ -22,51 +22,39 @@ limitations under the License.
xmlns="http://www.w3.org/1999/xhtml">
<!-- Buttons https://getmdl.io/components/index.html#buttons-section -->
- <mdl:Grid>
-
- <mdl:GridCell column="1">
- <mdl:Button className="mdlbtn"/>
- </mdl:GridCell>
+ <mdl:Grid width="100">
- <mdl:GridCell column="1">
- <!-- Fab button -->
- <mdl:Button id="mybtn" fab="true" colored="true">
- <mdl:beads>
- <mdl:Tooltip text="A simple tooltip"/>
- </mdl:beads>
- <mdl:materialIcon>
- <mdl:MaterialIconAdd/>
- </mdl:materialIcon>
- </mdl:Button>
- </mdl:GridCell>
+ <mdl:Button className="mdlbtn" style="display:block;"/>
- <mdl:GridCell column="2">
- <!-- Fab with Ripple -->
- <mdl:Button fab="true" ripple="true">
- <mdl:materialIcon>
- <mdl:MaterialIconFace size="48"/>
- </mdl:materialIcon>
- </mdl:Button>
- </mdl:GridCell>
-
- <mdl:GridCell column="2">
- <!-- Raised button -->
- <mdl:Button text="COLORED" raised="true" colored="true"/>
- </mdl:GridCell>
-
- <mdl:GridCell column="2">
- <!-- Raised button with ripple -->
- <mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/>
- </mdl:GridCell>
-
- <mdl:GridCell column="2">
- <!-- Raised disabled button-->
- <mdl:Button text="DISABLED" raised="true">
- <mdl:beads>
- <mdl:Disabled/>
- </mdl:beads>
- </mdl:Button>
- </mdl:GridCell>
+ <!-- Fab button -->
+ <mdl:Button id="mybtn" fab="true" colored="true" style="display:block;">
+ <mdl:beads>
+ <mdl:Tooltip text="A simple tooltip"/>
+ </mdl:beads>
+ <mdl:materialIcon>
+ <mdl:MaterialIconAdd/>
+ </mdl:materialIcon>
+ </mdl:Button>
+
+ <!-- Fab with Ripple -->
+ <mdl:Button fab="true" ripple="true" style="display:block;">
+ <mdl:materialIcon>
+ <mdl:MaterialIconFace size="48"/>
+ </mdl:materialIcon>
+ </mdl:Button>
+
+ <!-- Raised button -->
+ <mdl:Button text="COLORED" raised="true" colored="true" style="display:block;"/>
+
+ <!-- Raised button with ripple -->
+ <mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/>
+
+ <!-- Raised disabled button-->
+ <mdl:Button text="DISABLED" raised="true">
+ <mdl:beads>
+ <mdl:Disabled/>
+ </mdl:beads>
+ </mdl:Button>
</mdl:Grid>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37248573/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
index 9cbf2ae..a448b9a 100644
--- a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
@@ -68,6 +68,13 @@ limitations under the License.
</mdl:beads>
</mdl:TextField>
+ <mdl:TextField floatingLabel="true" width="100%">
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Floating and Expandible..."/>
+ <mdl:ExpandableSearch/>
+ </mdl:beads>
+ </mdl:TextField>
+
<mdl:TextArea width="100%">
<mdl:beads>
<mdl:TextPrompt prompt="Text lines..."/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37248573/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
index c853bdc..711cabd 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
@@ -100,7 +100,6 @@ package org.apache.flex.mdl.beads
div.appendChild(TextField(host).label);
TextField(host).input.setAttribute('id', searchId);
- TextField(host).label.innerHTML = "Expandible...";
}
else
{
[27/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Fix Slider change event causing stack overflow
Posted by bi...@apache.org.
Fix Slider change event causing stack overflow
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/57536525
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/57536525
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/57536525
Branch: refs/heads/feature/fontawesome
Commit: 575365258208238f4b73407ed5730aaca1450aad
Parents: 54cc4d5
Author: Carlos Rovira <ca...@apache.org>
Authored: Tue Jan 3 12:29:00 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Tue Jan 3 12:29:00 2017 +0100
----------------------------------------------------------------------
.../flex/mdl/beads/controllers/SliderMouseController.as | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/57536525/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
index a99f8f7..d001923 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
@@ -32,6 +32,7 @@ package org.apache.flex.mdl.beads.controllers
COMPILE::JS
{
import goog.events;
+ import goog.events.EventType;
import org.apache.flex.events.BrowserEvent;
import org.apache.flex.mdl.Slider;
}
@@ -96,8 +97,8 @@ package org.apache.flex.mdl.beads.controllers
//goog.events.listen(track.element, goog.events.EventType.CLICK, handleTrackClick, false, this);
//goog.events.listen(thumb.element, goog.events.EventType.MOUSEDOWN, handleThumbDown, false, this);
- goog.events.listen(UIBase(_strand).element, "change", handleChange, false, this);
- goog.events.listen(UIBase(_strand).element, "input", handleInput, false, this);
+ goog.events.listen(UIBase(_strand).element, goog.events.EventType.CHANGE, handleChange, false, this);
+ goog.events.listen(UIBase(_strand).element, goog.events.EventType.INPUT, handleInput, false, this);
}
}
@@ -110,7 +111,7 @@ package org.apache.flex.mdl.beads.controllers
rangeModel.value = Number((UIBase(_strand).element as HTMLInputElement).value);
- host.dispatchEvent(new org.apache.flex.events.Event('change'));
+ //host.dispatchEvent(new org.apache.flex.events.Event('change')); --- This is not needed, the event is thrown in the main comp
}
/**
[25/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Update MDL to version 1.3.0
Posted by bi...@apache.org.
Update MDL to version 1.3.0
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/de87ded9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/de87ded9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/de87ded9
Branch: refs/heads/feature/fontawesome
Commit: de87ded962434e836c9ce443925960c51bddde5d
Parents: b544583
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 2 18:52:09 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 2 18:52:09 2017 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/resources/mdl-js-index-template.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de87ded9/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html b/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
index 62cbf70..35e4c3a 100644
--- a/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
+++ b/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
@@ -23,8 +23,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"">
<link rel="stylesheet" type="text/css" href="${application}.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
- <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css">
- <script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script>
+ <link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.${primary}-${accent}.min.css">
+ <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
${head}
</head>
<body>
[11/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
MDL Search-Expandable bead for TextField MDL control
Posted by bi...@apache.org.
MDL Search-Expandable bead for TextField MDL control
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/48ba825e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/48ba825e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/48ba825e
Branch: refs/heads/feature/fontawesome
Commit: 48ba825ea72eccd32e15477cb2fbb5f236836216
Parents: 858d473
Author: Carlos Rovira <ca...@apache.org>
Authored: Sat Dec 31 17:40:12 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sat Dec 31 17:40:12 2016 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/TextFields.mxml | 14 +++
.../main/flex/org/apache/flex/mdl/TextField.as | 14 ++-
.../apache/flex/mdl/beads/ExpandableSearch.as | 112 +++++++++++++++++++
.../mdl/materialIcons/MaterialIconSearch.as | 52 +++++++++
.../flex/mdl/materialIcons/MaterialIconsType.as | 1 +
.../src/main/resources/mdl-manifest.xml | 2 +
6 files changed, 194 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/48ba825e/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
index 7c9b601..e53faaf 100644
--- a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
@@ -52,6 +52,20 @@ limitations under the License.
<mdl:Restrict pattern="-?[0-9]*(\.[0-9]+)?" error="Input is not a number!"/>
</mdl:beads>
</mdl:TextField>
+
+ <mdl:TextField>
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Expandible..."/>
+ <mdl:ExpandableSearch/>
+ </mdl:beads>
+ </mdl:TextField>
+
+ <mdl:TextField>
+ <mdl:beads>
+ <mdl:TextPrompt prompt="Expandible..."/>
+ <mdl:ExpandableSearch/>
+ </mdl:beads>
+ </mdl:TextField>
</mdl:Grid>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/48ba825e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
index e84f058..8b43101 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
@@ -77,6 +77,18 @@ package org.apache.flex.mdl
{
_input = value;
}
+
+ private var _label:HTMLLabelElement;
+
+ public function get label():HTMLLabelElement
+ {
+ return _label;
+ }
+
+ public function set label(value:HTMLLabelElement):void
+ {
+ _label = value;
+ }
}
/**
@@ -102,7 +114,7 @@ package org.apache.flex.mdl
//goog.events.listen(element, 'change', killChangeHandler);
goog.events.listen(input, 'input', textChangeHandler);
- var label:HTMLLabelElement = document.createElement('label') as HTMLLabelElement;
+ label = document.createElement('label') as HTMLLabelElement;
label.className = "mdl-textfield__label";
textNode = document.createTextNode('') as Text;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/48ba825e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
new file mode 100644
index 0000000..c853bdc
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
@@ -0,0 +1,112 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.beads
+{
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.UIBase;
+
+ import org.apache.flex.mdl.TextField;
+ import org.apache.flex.mdl.materialIcons.MaterialIconSearch;
+
+ /**
+ * The ExpandableSearch bead class is a specialty bead that can be used to decorate a TextField MDL control.
+ * It makes the TextField to expand when user clicks the associated search icon.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ExpandableSearch implements IBead
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ExpandableSearch()
+ {
+ }
+
+ /**
+ * Provides unique name
+ */
+ public static var tfCounter:int = 0;
+
+ private var host:UIBase;
+
+ private var _strand:IStrand;
+ /**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.mdl.TextInput;
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+
+ COMPILE::JS
+ {
+ host = value as UIBase;
+
+ if (host is TextField)
+ {
+ var searchId:String = '_searchId_' + ExpandableSearch.tfCounter++;
+
+ host.positioner.classList.add("mdl-textfield--expandable");
+
+ var label:HTMLLabelElement = document.createElement('label') as HTMLLabelElement;
+ label.className = "mdl-button mdl-js-button mdl-button--icon";
+ label.setAttribute('for', searchId);
+
+ var i:HTMLElement = document.createElement('i') as HTMLElement;
+ i.className = "material-icons";
+ i.innerHTML = "search";
+
+ label.appendChild(i);
+
+ host.positioner.appendChild(label);
+
+ var div:HTMLDivElement = document.createElement('div') as HTMLDivElement;
+ div.className = "mdl-textfield__expandable-holder";
+
+ host.positioner.appendChild(div);
+
+ div.appendChild(TextField(host).input);
+ div.appendChild(TextField(host).label);
+
+ TextField(host).input.setAttribute('id', searchId);
+ TextField(host).label.innerHTML = "Expandible...";
+ }
+ else
+ {
+ throw new Error("Host component must be an MDL TextField.");
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/48ba825e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as
new file mode 100644
index 0000000..0a1cf5e
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as
@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.materialIcons
+{
+ import org.apache.flex.mdl.supportClasses.MaterialIconBase;
+
+ /**
+ * The MaterialIconSearch bead class is a specialty bead that add "search" icon
+ * to component taken from "material-icons"
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class MaterialIconSearch extends MaterialIconBase
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function MaterialIconSearch()
+ {
+ super();
+ }
+
+ override protected function get iconText():String
+ {
+ return MaterialIconsType.SEARCH;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/48ba825e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
index 0f2fc1e..1174287 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
@@ -28,5 +28,6 @@ package org.apache.flex.mdl.materialIcons
public static const EVENT:String = "event";
public static const FACE:String = "face";
public static const MORE_VERT:String = "more_vert";
+ public static const SEARCH:String = "search";
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/48ba825e/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index dec087f..8d6dd57 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -27,6 +27,7 @@
<component id="RadioButton" class="org.apache.flex.mdl.RadioButton"/>
<component id="Switch" class="org.apache.flex.mdl.Switch"/>
<component id="TextPrompt" class="org.apache.flex.mdl.beads.TextPrompt"/>
+ <component id="ExpandableSearch" class="org.apache.flex.mdl.beads.ExpandableSearch"/>
<component id="Restrict" class="org.apache.flex.mdl.beads.Restrict"/>
<component id="Disabled" class="org.apache.flex.mdl.beads.Disabled"/>
<component id="Slider" class="org.apache.flex.mdl.Slider"/>
@@ -81,6 +82,7 @@
<component id="MaterialIconEvent" class="org.apache.flex.mdl.materialIcons.MaterialIconEvent"/>
<component id="MaterialIconFace" class="org.apache.flex.mdl.materialIcons.MaterialIconFace"/>
<component id="MaterialIconMoreVert" class="org.apache.flex.mdl.materialIcons.MaterialIconMoreVert"/>
+ <component id="MaterialIconSearch" class="org.apache.flex.mdl.materialIcons.MaterialIconSearch"/>
<component id="ContactChip" class="org.apache.flex.mdl.beads.ContactChip"/>
<component id="ContactImageChip" class="org.apache.flex.mdl.beads.ContactImageChip"/>
<component id="Tooltip" class="org.apache.flex.mdl.beads.Tooltip"/>
[02/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - -
Extract Toast - simpler version of Snackbar - Create IToastModel and
ISnackbarModel - responsible for creation of configuration object for
Snackbar
Posted by bi...@apache.org.
- Extract Toast - simpler version of Snackbar
- Create IToastModel and ISnackbarModel - responsible for creation of configuration object for Snackbar
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/79db0740
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/79db0740
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/79db0740
Branch: refs/heads/feature/fontawesome
Commit: 79db0740ec5a5b70f0c4c730699f0c005071cb4e
Parents: c854826
Author: piotrz <pi...@apache.org>
Authored: Wed Dec 28 15:03:10 2016 +0100
Committer: piotrz <pi...@apache.org>
Committed: Wed Dec 28 15:03:10 2016 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/Snackbar.mxml | 22 ++-
.../flex/org/apache/flex/core/IStyleObject.as | 2 -
.../src/main/flex/MDLClasses.as | 4 +-
.../main/flex/org/apache/flex/mdl/Snackbar.as | 157 ++---------------
.../src/main/flex/org/apache/flex/mdl/Toast.as | 172 +++++++++++++++++++
.../flex/mdl/beads/models/ISnackbarModel.as | 28 +++
.../apache/flex/mdl/beads/models/IToastModel.as | 32 ++++
.../flex/mdl/beads/models/SnackbarModel.as | 88 ++++++++++
.../apache/flex/mdl/beads/models/ToastModel.as | 69 ++++++++
.../src/main/resources/defaults.css | 9 +
.../src/main/resources/mdl-manifest.xml | 3 +
11 files changed, 439 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml b/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
index 4b9e20e..fb46676 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
@@ -21,24 +21,36 @@ limitations under the License.
xmlns:mdl="library://ns.apache.org/flexjs/mdl">
<mdl:Grid>
<mdl:GridCell column="1">
- <mdl:Button id="showSnackbar" click="onShowSnackBarClick(event)"
- text="Show snackbar!" width="200" accent="true" colored="true" raised="true"/>
- <mdl:Snackbar id="snackbar" message="Snack bar message" actionText="Undo" timeout="3000"
+ <mdl:Button id="showToast" click="onShowToastClick(event)"
+ text="Show Toast!" width="200" accent="true" colored="true" raised="true"/>
+ <mdl:Toast id="toast" message="Toast message" timeout="3000"/>
+ </mdl:GridCell>
+ <mdl:GridCell column="1">
+ <mdl:Button id="showSnackbar" click="onShowSnackbarClick(event)"
+ text="Show !" width="200" accent="true" colored="true" raised="true"/>
+ <mdl:Snackbar id="snackbar" message="Snackbar message" actionText="Undo" timeout="3000"
action="onSnackBarAction(event)"/>
</mdl:GridCell>
</mdl:Grid>
<fx:Script><![CDATA[
import org.apache.flex.events.Event;
import org.apache.flex.events.MouseEvent;
+ import org.apache.flex.events.MouseEvent;
- private function onShowSnackBarClick(event:MouseEvent):void
+ private function onShowToastClick(event:MouseEvent):void
+ {
+ toast.show();
+ }
+
+ private function onShowSnackbarClick(event:MouseEvent):void
{
snackbar.show();
}
private function onSnackBarAction(event:Event):void
{
- //some action here
+ //some action here
}
+
]]></fx:Script>
</mdl:TabBarPanel>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStyleObject.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStyleObject.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStyleObject.as
index f8b3862..968a122 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStyleObject.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStyleObject.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
- import org.apache.flex.events.IEventDispatcher;
-
/**
* The IStyleObject interface is the interface for
* objects that contain style properties.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
index a11f639..6136bec 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
@@ -27,7 +27,9 @@ package
*/
internal class MDLClasses
{
-
+ import org.apache.flex.mdl.beads.models.ToastModel; ToastModel;
+ import org.apache.flex.mdl.beads.models.SnackbarModel; SnackbarModel;
+
COMPILE::SWF
{
import org.apache.flex.mdl.beads.SliderThumbView; SliderThumbView;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
index 2d614c6..f4b2944 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
@@ -18,19 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
- import org.apache.flex.events.EventDispatcher;
-
- COMPILE::SWF
- {
- import flash.events.Event;
- }
-
- COMPILE::JS
- {
- import org.apache.flex.events.Event;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.core.WrappedHTMLElement;
- }
+ import org.apache.flex.mdl.beads.models.ISnackbarModel;
/**
* Dispatched when the user click on Snackbar
@@ -43,30 +31,10 @@ package org.apache.flex.mdl
[Event(name="action", type="org.apache.flex.events.Event")]
COMPILE::SWF
- public class Snackbar extends EventDispatcher
+ public class Snackbar extends Toast
{
- private var _message:String;
private var _actionText:String;
- private var _timeout:int = 2750;
-
- /**
- * Message to be displayed on Snackbar
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get message():String
- {
- return _message;
- }
-
- public function set message(value:String):void
- {
- _message = value;
- }
-
+
/**
* Text which appears on action button
*
@@ -84,142 +52,53 @@ package org.apache.flex.mdl
{
_actionText = value;
}
-
- /**
- * Timout in milliseconds for hiding Snackbar
- *
- * @default 2750
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get timeout():int
- {
- return _timeout;
- }
-
- public function set timeout(value:int):void
- {
- _timeout = value;
- }
-
- /**
- * Show the snackbar
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function show():void
- {
- dispatchEvent(new Event("action"));
- }
}
COMPILE::JS
- public class Snackbar extends UIBase
+ public class Snackbar extends Toast
{
public function Snackbar()
{
super();
-
- className = "";
}
- private var snackbar:Object;
-
- private var snackbarText:HTMLDivElement;
- private var snackbarAction:HTMLButtonElement;
-
- private var _message:String = "";
- private var _actionText:String = "";
- private var _timeout:int = 2000;
-
- public function get message():String
+ override public function get message():String
{
- return _message;
+ return ISnackbarModel(model).message;
}
- public function set message(value:String):void
+ override public function set message(value:String):void
{
- _message = value;
+ ISnackbarModel(model).message = value;
}
- public function get actionText():String
+ override public function get timeout():int
{
- return _actionText;
+ return ISnackbarModel(model).timeout;
}
- public function set actionText(value:String):void
+ override public function set timeout(value:int):void
{
- _actionText = value;
+ ISnackbarModel(model).timeout = value;
}
- public function get timeout():int
+ public function get actionText():String
{
- return _timeout;
+ return ISnackbarModel(model).actionText;
}
- public function set timeout(value:int):void
+ public function set actionText(value:String):void
{
- _timeout = value;
+ ISnackbarModel(model).actionText = value;
}
- public function show():void
+ override public function show():void
{
if (snackbar)
{
- var snackbarData:Object = {
- message: _message,
- timeout: _timeout,
- actionHandler: onActionHandler,
- actionText: _actionText
- };
-
+ var snackbarData:Object = ISnackbarModel(model).snackbarData;
snackbar.showSnackbar(snackbarData);
}
}
-
- private function onActionHandler(event:Event):void
- {
- dispatchEvent(new Event("action"));
- }
-
- /**
- * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- * @flexjsignorecoercion HTMLDivElement
- * @flexjsignorecoercion HTMLButtonElement
- *
- * @return
- */
- override protected function createElement():WrappedHTMLElement
- {
- typeNames = "mdl-js-snackbar mdl-snackbar";
-
- element = document.createElement("div") as WrappedHTMLElement;
- element.addEventListener("mdl-componentupgraded", onElementMdlComponentUpgraded, false);
-
- snackbarText = document.createElement("div") as HTMLDivElement;
- snackbarText.classList.add("mdl-snackbar__text");
- element.appendChild(snackbarText);
-
- snackbarAction = document.createElement("button") as HTMLButtonElement;
- snackbarAction.classList.add("mdl-snackbar__action");
- element.appendChild(snackbarAction);
-
- positioner = element;
- element.flexjs_wrapper = this;
-
- return element;
- }
-
- private function onElementMdlComponentUpgraded(event:Event):void
- {
- if (!event.currentTarget) return;
-
- snackbar = event.currentTarget.MaterialSnackbar;
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Toast.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Toast.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Toast.as
new file mode 100644
index 0000000..a03dd95
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Toast.as
@@ -0,0 +1,172 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl
+{
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.mdl.beads.models.IToastModel;
+
+ COMPILE::SWF
+ {
+ import flash.events.Event;
+ }
+
+ COMPILE::JS
+ {
+ import org.apache.flex.events.Event;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ COMPILE::SWF
+ public class Toast extends EventDispatcher
+ {
+ private var _message:String;
+ private var _timeout:int = 2750;
+
+ /**
+ * Message to be displayed on Snackbar
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get message():String
+ {
+ return _message;
+ }
+
+ public function set message(value:String):void
+ {
+ _message = value;
+ }
+
+ /**
+ * Timout in milliseconds for hiding Snackbar
+ *
+ * @default 2750
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get timeout():int
+ {
+ return _timeout;
+ }
+
+ public function set timeout(value:int):void
+ {
+ _timeout = value;
+ }
+
+ /**
+ * Show the snackbar
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function show():void
+ {
+ dispatchEvent(new Event("action"));
+ }
+ }
+
+ COMPILE::JS
+ public class Toast extends UIBase
+ {
+ public function Toast()
+ {
+ super();
+
+ className = "";
+ }
+
+ protected var snackbar:Object;
+
+ private var snackbarAction:HTMLButtonElement;
+ private var snackbarText:HTMLDivElement;
+
+ public function get message():String
+ {
+ return IToastModel(model).message;
+ }
+
+ public function set message(value:String):void
+ {
+ IToastModel(model).message = value;
+ }
+
+ public function get timeout():int
+ {
+ return IToastModel(model).timeout;
+ }
+
+ public function set timeout(value:int):void
+ {
+ IToastModel(model).timeout = value;
+ }
+
+ public function show():void
+ {
+ if (snackbar)
+ {
+ var snackbarData:Object = IToastModel(model).snackbarData;
+ snackbar.showSnackbar(snackbarData);
+ }
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion HTMLDivElement
+ * @flexjsignorecoercion HTMLButtonElement
+ *
+ * @return
+ */
+ override protected function createElement():WrappedHTMLElement
+ {
+ typeNames = "mdl-js-snackbar mdl-snackbar";
+
+ element = document.createElement("div") as WrappedHTMLElement;
+ element.addEventListener("mdl-componentupgraded", onElementMdlComponentUpgraded, false);
+
+ snackbarText = document.createElement("div") as HTMLDivElement;
+ snackbarText.classList.add("mdl-snackbar__text");
+ element.appendChild(snackbarText);
+
+ snackbarAction = document.createElement("button") as HTMLButtonElement;
+ snackbarAction.classList.add("mdl-snackbar__action");
+ element.appendChild(snackbarAction);
+
+ positioner = element;
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+
+ private function onElementMdlComponentUpgraded(event:Event):void
+ {
+ if (!event.currentTarget) return;
+
+ snackbar = event.currentTarget.MaterialSnackbar;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ISnackbarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ISnackbarModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ISnackbarModel.as
new file mode 100644
index 0000000..6236f6a
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ISnackbarModel.as
@@ -0,0 +1,28 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.beads.models
+{
+ import org.apache.flex.events.IEventDispatcher;
+
+ public interface ISnackbarModel extends IToastModel, IEventDispatcher
+ {
+ function get actionText():String;
+ function set actionText(value:String):void;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IToastModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IToastModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IToastModel.as
new file mode 100644
index 0000000..cf740d2
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IToastModel.as
@@ -0,0 +1,32 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.beads.models
+{
+ import org.apache.flex.core.IBeadModel;
+
+ public interface IToastModel extends IBeadModel
+ {
+ function get message():String;
+ function set message(value:String):void;
+ function get timeout():int
+ function set timeout(value:int):void;
+
+ function get snackbarData():Object;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
new file mode 100644
index 0000000..be182fd
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
@@ -0,0 +1,88 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.beads.models
+{
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.events.Event;
+
+ public class SnackbarModel extends EventDispatcher implements ISnackbarModel
+ {
+ private var _message:String = "";
+ private var _timeout:int = 2750;
+ private var _actionText:String = "";
+
+ private var _strand:IStrand;
+
+ public function SnackbarModel()
+ {
+ super();
+ }
+
+ public function get message():String
+ {
+ return _message;
+ }
+
+ public function set message(value:String):void
+ {
+ _message = value;
+ }
+
+ public function get timeout():int
+ {
+ return _timeout;
+ }
+
+ public function set timeout(value:int):void
+ {
+ _timeout = value;
+ }
+
+ public function get actionText():String
+ {
+ return _actionText;
+ }
+
+ public function set actionText(value:String):void
+ {
+ _actionText = value;
+ }
+
+ public function get snackbarData():Object
+ {
+ return {
+ message: _message,
+ timeout: _timeout,
+ actionHandler: onActionHandler,
+ actionText: _actionText
+ };
+ }
+
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ }
+
+ private function onActionHandler(event:Event):void
+ {
+ dispatchEvent(new Event("action"));
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ToastModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ToastModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ToastModel.as
new file mode 100644
index 0000000..0af73d5
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ToastModel.as
@@ -0,0 +1,69 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.beads.models
+{
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.EventDispatcher;
+
+ public class ToastModel extends EventDispatcher implements IToastModel
+ {
+ private var _message:String = "";
+ private var _timeout:int = 2750;
+
+ private var _strand:IStrand;
+
+ public function ToastModel()
+ {
+ super();
+ }
+
+ public function get message():String
+ {
+ return _message;
+ }
+
+ public function set message(value:String):void
+ {
+ _message = value;
+ }
+
+ public function get timeout():int
+ {
+ return _timeout;
+ }
+
+ public function set timeout(value:int):void
+ {
+ _timeout = value;
+ }
+
+ public function get snackbarData():Object
+ {
+ return {
+ message: _message,
+ timeout: _timeout
+ };
+ }
+
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 14efca5..1ebf7dc 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -42,6 +42,15 @@ List
IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.ListItemRenderer");
}
+Toast
+{
+ IBeadModel: ClassReference("org.apache.flex.mdl.beads.models.ToastModel");
+}
+
+Snackbar
+{
+ IBeadModel: ClassReference("org.apache.flex.mdl.beads.models.SnackbarModel");
+}
@media -flex-flash
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79db0740/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index a785b19..dec087f 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -88,5 +88,8 @@
<component id="MdlTextColor" class="org.apache.flex.mdl.beads.MdlTextColor"/>
<component id="Spinner" class="org.apache.flex.mdl.Spinner"/>
<component id="ProgressBar" class="org.apache.flex.mdl.ProgressBar"/>
+ <component id="ToastModel" class="org.apache.flex.mdl.beads.models.ToastModel"/>
+ <component id="Toast" class="org.apache.flex.mdl.Toast"/>
+ <component id="SnackbarModel" class="org.apache.flex.mdl.beads.models.SnackbarModel"/>
<component id="Snackbar" class="org.apache.flex.mdl.Snackbar"/>
</componentPackage>
[15/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Refactor to TextFieldBase to remove duplicated code and better management of
common functionality
Posted by bi...@apache.org.
Refactor to TextFieldBase to remove duplicated code and better management of common functionality
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/81bf74d4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/81bf74d4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/81bf74d4
Branch: refs/heads/feature/fontawesome
Commit: 81bf74d4cece0220d845ab782cef5bbe31f34c17
Parents: 3724857
Author: Carlos Rovira <ca...@apache.org>
Authored: Sun Jan 1 20:08:46 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sun Jan 1 20:08:46 2017 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/TextFields.mxml | 5 +-
.../main/flex/org/apache/flex/mdl/TextArea.as | 87 +---------
.../main/flex/org/apache/flex/mdl/TextField.as | 87 +---------
.../flex/mdl/supportClasses/TextFieldBase.as | 162 +++++++++++++++++++
4 files changed, 168 insertions(+), 173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/81bf74d4/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
index a448b9a..8c50fc2 100644
--- a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
@@ -81,10 +81,9 @@ limitations under the License.
</mdl:beads>
</mdl:TextArea>
- <mdl:TextArea floatingLabel="true" width="100%" rows="5" maxrows="8">
+ <mdl:TextArea floatingLabel="true" width="100%" rows="5" maxrows="8" isInvalid="true">
<mdl:beads>
- <mdl:TextPrompt prompt="Floating, maxrows 8 and only letters..."/>
- <mdl:Restrict pattern="[A-Z,a-z, ]*" error="Letters and spaces only"/>
+ <mdl:TextPrompt prompt="Floating, maxrows 8, invalid on load"/>
</mdl:beads>
</mdl:TextArea>
</js:Form>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/81bf74d4/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
index 167485f..056e7ee 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
@@ -18,9 +18,8 @@
package org.apache.flex.mdl
{
import org.apache.flex.events.Event;
- import org.apache.flex.html.TextInput;
- import org.apache.flex.mdl.supportClasses.ITextField;
+ import org.apache.flex.mdl.supportClasses.TextFieldBase;
COMPILE::JS
{
@@ -37,7 +36,7 @@ package org.apache.flex.mdl
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class TextArea extends org.apache.flex.html.TextInput implements ITextField
+ public class TextArea extends TextFieldBase
{
/**
* Constructor.
@@ -100,45 +99,6 @@ package org.apache.flex.mdl
}
}
- COMPILE::JS
- {
- private var _textNode:Text;
-
- public function get textNode():Text
- {
- return _textNode;
- }
-
- public function set textNode(value:Text):void
- {
- _textNode = value;
- }
-
- private var _input:HTMLInputElement;
-
- public function get input():HTMLInputElement
- {
- return _input;
- }
-
- public function set input(value:HTMLInputElement):void
- {
- _input = value;
- }
-
- private var _label:HTMLLabelElement;
-
- public function get label():HTMLLabelElement
- {
- return _label;
- }
-
- public function set label(value:HTMLLabelElement):void
- {
- _label = value;
- }
- }
-
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
* @flexjsignorecoercion HTMLDivElement
@@ -182,48 +142,5 @@ package org.apache.flex.mdl
return element;
}
-
- private var _className:String;
-
- /**
- * since we have a div surronding the main input, we need to
- * route the class assignaments to div
- */
- override public function set className(value:String):void
- {
- if (_className != value)
- {
- COMPILE::JS
- {
- positioner.className = typeNames ? value + ' ' + typeNames : value;
- }
- _className = value;
- dispatchEvent(new Event("classNameChanged"));
- }
- }
-
- private var _floatingLabel:Boolean = false;
- /**
- * A boolean flag to activate "mdl-textfield--floating-label" effect selector.
- * Applies floating label effect.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get floatingLabel():Boolean
- {
- return _floatingLabel;
- }
- public function set floatingLabel(value:Boolean):void
- {
- _floatingLabel = value;
-
- COMPILE::JS
- {
- positioner.classList.toggle("mdl-textfield--floating-label", _floatingLabel);
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/81bf74d4/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
index dba1384..f68a02a 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
@@ -18,9 +18,8 @@
package org.apache.flex.mdl
{
import org.apache.flex.events.Event;
- import org.apache.flex.html.TextInput;
- import org.apache.flex.mdl.supportClasses.ITextField;
+ import org.apache.flex.mdl.supportClasses.TextFieldBase;
COMPILE::JS
{
@@ -37,7 +36,7 @@ package org.apache.flex.mdl
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class TextField extends org.apache.flex.html.TextInput implements ITextField
+ public class TextField extends TextFieldBase
{
/**
* Constructor.
@@ -53,45 +52,6 @@ package org.apache.flex.mdl
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
}
-
- COMPILE::JS
- {
- private var _textNode:Text;
-
- public function get textNode():Text
- {
- return _textNode;
- }
-
- public function set textNode(value:Text):void
- {
- _textNode = value;
- }
-
- private var _input:HTMLInputElement;
-
- public function get input():HTMLInputElement
- {
- return _input;
- }
-
- public function set input(value:HTMLInputElement):void
- {
- _input = value;
- }
-
- private var _label:HTMLLabelElement;
-
- public function get label():HTMLLabelElement
- {
- return _label;
- }
-
- public function set label(value:HTMLLabelElement):void
- {
- _label = value;
- }
- }
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
@@ -134,48 +94,5 @@ package org.apache.flex.mdl
return element;
}
-
- private var _className:String;
-
- /**
- * since we have a div surronding the main input, we need to
- * route the class assignaments to div
- */
- override public function set className(value:String):void
- {
- if (_className != value)
- {
- COMPILE::JS
- {
- positioner.className = typeNames ? value + ' ' + typeNames : value;
- }
- _className = value;
- dispatchEvent(new Event("classNameChanged"));
- }
- }
-
- private var _floatingLabel:Boolean = false;
- /**
- * A boolean flag to activate "mdl-textfield--floating-label" effect selector.
- * Applies floating label effect.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get floatingLabel():Boolean
- {
- return _floatingLabel;
- }
- public function set floatingLabel(value:Boolean):void
- {
- _floatingLabel = value;
-
- COMPILE::JS
- {
- positioner.classList.toggle("mdl-textfield--floating-label", _floatingLabel);
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/81bf74d4/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/TextFieldBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/TextFieldBase.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/TextFieldBase.as
new file mode 100644
index 0000000..748ee46
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/TextFieldBase.as
@@ -0,0 +1,162 @@
+//
+// 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.mdl.supportClasses
+{
+ import org.apache.flex.events.Event;
+ import org.apache.flex.html.TextInput;
+
+ import org.apache.flex.mdl.supportClasses.ITextField;
+
+ COMPILE::JS
+ {
+ import goog.events;
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The TextFieldBase class is the base class for TextField and TextArea MDL controls
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class TextFieldBase extends org.apache.flex.html.TextInput implements ITextField
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function TextFieldBase()
+ {
+ super();
+
+ className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ }
+
+ COMPILE::JS
+ {
+ private var _textNode:Text;
+
+ public function get textNode():Text
+ {
+ return _textNode;
+ }
+
+ public function set textNode(value:Text):void
+ {
+ _textNode = value;
+ }
+
+ private var _input:HTMLInputElement;
+
+ public function get input():HTMLInputElement
+ {
+ return _input;
+ }
+
+ public function set input(value:HTMLInputElement):void
+ {
+ _input = value;
+ }
+
+ private var _label:HTMLLabelElement;
+
+ public function get label():HTMLLabelElement
+ {
+ return _label;
+ }
+
+ public function set label(value:HTMLLabelElement):void
+ {
+ _label = value;
+ }
+ }
+
+ private var _className:String;
+
+ /**
+ * since we have a div surronding the main input, we need to
+ * route the class assignaments to div
+ */
+ override public function set className(value:String):void
+ {
+ if (_className != value)
+ {
+ COMPILE::JS
+ {
+ positioner.className = typeNames ? value + ' ' + typeNames : value;
+ }
+ _className = value;
+ dispatchEvent(new Event("classNameChanged"));
+ }
+ }
+
+ private var _floatingLabel:Boolean = false;
+ /**
+ * A boolean flag to activate "mdl-textfield--floating-label" effect selector.
+ * Applies floating label effect.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get floatingLabel():Boolean
+ {
+ return _floatingLabel;
+ }
+ public function set floatingLabel(value:Boolean):void
+ {
+ _floatingLabel = value;
+
+ COMPILE::JS
+ {
+ positioner.classList.toggle("mdl-textfield--floating-label", _floatingLabel);
+ }
+ }
+
+ private var _isInvalid:Boolean = false;
+ /**
+ * A boolean flag to activate "is-invalid" effect selector.
+ * Defines the textfield as invalid on initial load.Optional
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get isInvalid():Boolean
+ {
+ return _isInvalid;
+ }
+ public function set isInvalid(value:Boolean):void
+ {
+ _isInvalid = value;
+
+ COMPILE::JS
+ {
+ positioner.classList.toggle("is-invalid", _isInvalid);
+ }
+ }
+ }
+}
[17/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
MDL Menu with dataProvider API - Menu behaves like MDL List - it is uses
ListView - MenuItem has been changed to MenuItemRenderer - Add to Disabled
bead possibility to switch off using "d
Posted by bi...@apache.org.
MDL Menu with dataProvider API - Menu behaves like MDL List - it is uses ListView
- MenuItem has been changed to MenuItemRenderer
- Add to Disabled bead possibility to switch off using "disabled" property
- Attempt to create sub menu using CustomMenuItemRenderer - not working version
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8253a0dc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8253a0dc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8253a0dc
Branch: refs/heads/feature/fontawesome
Commit: 8253a0dcc66ece2056dfadefc777660396211abe
Parents: fadd9f0
Author: piotrz <pi...@apache.org>
Authored: Sun Jan 1 21:33:57 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Sun Jan 1 21:33:57 2017 +0100
----------------------------------------------------------------------
.../src/main/flex/MainNavigation.mxml | 24 +--
.../itemRenderers/CustomMenuItemRenderer.mxml | 66 +++++++
.../src/main/flex/models/MenuModel.as | 50 +++++
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 64 +++++++
.../src/main/resources/mdl-styles.css | 9 +-
.../src/main/flex/org/apache/flex/mdl/Menu.as | 132 ++++++++++---
.../main/flex/org/apache/flex/mdl/MenuItem.as | 158 ---------------
.../flex/org/apache/flex/mdl/beads/Disabled.as | 25 ++-
.../flex/mdl/itemRenderers/MenuItemRenderer.as | 191 +++++++++++++++++++
.../ItemRendererFactoryForArrayData.as | 7 +-
.../src/main/resources/defaults.css | 10 +
.../src/main/resources/mdl-manifest.xml | 2 +-
12 files changed, 535 insertions(+), 203 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
index ec59a33..e9f668d 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -21,8 +21,12 @@ limitations under the License.
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:local="*"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
- xmlns="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.w3.org/1999/xhtml" xmlns:models="models.*"
fixedHeader="true">
+ <mdl:model>
+ <models:MenuModel id="menuModel"/>
+ </mdl:model>
+
<mdl:Header>
<mdl:HeaderRow>
<mdl:LayoutTitle text="FlexJS Material Design Layout"/>
@@ -120,16 +124,14 @@ limitations under the License.
</mdl:materialIcon>
</mdl:Button>
- <mdl:Menu dataMdlFor="menu_btn" ripple="true" bottom="true" left="false">
- <mdl:MenuItem text="Some Action"/>
- <mdl:MenuItem text="Another Action"/>
- <mdl:MenuItem text="Action Disabled">
- <mdl:beads>
- <mdl:Disabled/>
- </mdl:beads>
- </mdl:MenuItem>
- <mdl:MenuItem text="More Action" divider="true"/>
- <mdl:MenuItem text="Separated Action"/>
+ <mdl:Menu dataMdlFor="menu_btn" ripple="true" bottom="true" left="false"
+ labelField="label">
+ <mdl:beads>
+ <js:ConstantBinding
+ sourceID="menuModel"
+ sourcePropertyName="menuItems"
+ destinationPropertyName="dataProvider" />
+ </mdl:beads>
</mdl:Menu>
</mdl:TabBarPanel>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
new file mode 100644
index 0000000..25b55ca
--- /dev/null
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
@@ -0,0 +1,66 @@
+<?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.
+
+-->
+<mdl:MenuItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:models="models.*"
+ xmlns:js="library://ns.apache.org/flexjs/basic" rollOver="onMenuItemRollOver(event)">
+ <mdl:model>
+ <models:MenuModel id="subMenuModel"/>
+ </mdl:model>
+ <mdl:beads>
+ <mdl:Disabled disabled="{menuItem.disabled}"/>
+ </mdl:beads>
+ <fx:Script><![CDATA[
+ import org.apache.flex.events.MouseEvent;
+
+ import vos.MenuItemVO;
+
+ [Bindable("dataChange")]
+ public function get menuItem():MenuItemVO
+ {
+ return data as MenuItemVO;
+ }
+
+ override public function set data(value:Object):void
+ {
+ super.data = value;
+
+ if (value && value.hasSubMenu)
+ {
+ id = "subMenu";
+ }
+ }
+
+ private function onMenuItemRollOver(event:MouseEvent):void
+ {
+ if (menuItem.hasSubMenu)
+ {
+ subMenu.show();
+ }
+ }
+ ]]></fx:Script>
+ <mdl:Menu id="subMenu" dataMdlFor="subMenu" left="true" labelField="label">
+ <mdl:beads>
+ <js:ConstantBinding
+ sourceID="subMenuModel"
+ sourcePropertyName="subMenuItems"
+ destinationPropertyName="dataProvider" />
+ </mdl:beads>
+ </mdl:Menu>
+</mdl:MenuItemRenderer>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
new file mode 100644
index 0000000..382a512
--- /dev/null
+++ b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
@@ -0,0 +1,50 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.EventDispatcher;
+ import org.apache.flex.events.IEventDispatcher;
+
+ import vos.MenuItemVO;
+
+ public class MenuModel extends EventDispatcher
+ {
+ private var _menuItems:Array = [
+ new MenuItemVO("Some Action"),
+ new MenuItemVO("Another Action"),
+ new MenuItemVO("More Action", false, true)
+ ];
+
+ private var _subMenuItems:Array = [
+ new MenuItemVO("Sub Menu Action"),
+ new MenuItemVO("Sub Menu Action"),
+ new MenuItemVO("Sub Menu Action")
+ ]
+
+ public function get menuItems():Array
+ {
+ return _menuItems;
+ }
+
+ public function get subMenuItems():Array
+ {
+ return _subMenuItems;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
new file mode 100644
index 0000000..13f983b
--- /dev/null
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -0,0 +1,64 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 vos
+{
+ public class MenuItemVO
+ {
+ private var _label:String;
+ private var _disabled:Boolean;
+ private var _hasSubMenu:Boolean;
+
+ public function MenuItemVO(label:String, disabled:Boolean = false, hasSubMenu:Boolean = false)
+ {
+ this.label = label;
+ this.disabled = disabled;
+ this.hasSubMenu = hasSubMenu;
+ }
+
+ public function get label():String
+ {
+ return _label;
+ }
+
+ public function set label(value:String):void
+ {
+ _label = value;
+ }
+
+ public function get disabled():Boolean
+ {
+ return _disabled;
+ }
+
+ public function set disabled(value:Boolean):void
+ {
+ _disabled = value;
+ }
+
+ public function get hasSubMenu():Boolean
+ {
+ return _hasSubMenu;
+ }
+
+ public function set hasSubMenu(value:Boolean):void
+ {
+ _hasSubMenu = value;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
index 176b565..483146b 100644
--- a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
+++ b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
@@ -73,10 +73,15 @@ js|Image
IItemRenderer: ClassReference("itemRenderers.AvatarAndActionThreeLineListItemRenderer");
}
-/*.customListItemRenderer
+.menuItemRenderer
+{
+ IItemRenderer: ClassReference("itemRenderers.CustomMenuItemRenderer");
+}
+
+.customListItemRenderer
{
IItemRenderer: ClassReference("itemRenderers.CustomListItemRenderer");
-}*/
+}
.layoutTransparent {
background: url('assets/transparent.jpg') center / cover;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/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 239c40e..35ff07e 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
@@ -18,10 +18,18 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
- import org.apache.flex.core.ContainerBase;
+ import org.apache.flex.core.ContainerBase;
+ import org.apache.flex.core.IChild;
+ 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.IParentIUIBase;
+ import org.apache.flex.core.ISelectionModel;
COMPILE::JS
{
+ import org.apache.flex.events.Event;
import org.apache.flex.core.WrappedHTMLElement;
}
@@ -33,7 +41,7 @@ package org.apache.flex.mdl
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Menu extends ContainerBase
+ public class Menu extends ContainerBase implements IItemRendererParent, ILayoutParent, ILayoutHost
{
/**
* Constructor.
@@ -49,7 +57,68 @@ package org.apache.flex.mdl
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
}
-
+
+ COMPILE::JS
+ private var materialMenu:Object;
+ /**
+ * default position for Menu in MDL is bottom/left (or no class selector specified)
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ private var currentMenuPosition:String = "";
+
+ 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
+ {
+
+ }
+
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
*/
@@ -59,16 +128,16 @@ package org.apache.flex.mdl
typeNames = "mdl-menu mdl-js-menu";
element = document.createElement('ul') as WrappedHTMLElement;
-
+ element.addEventListener("mdl-componentupgraded", onElementMdlComponentUpgraded, false);
+
positioner = element;
element.flexjs_wrapper = this;
return element;
}
- // default position for Menu in MDL is bottom/left (or no class selector specified)
- private var currentPosClazz:String = "";
private var _bottom:Boolean = true;
+
/**
* Position the menu relative to the associated button.
* Used in conjunction with "left"
@@ -87,20 +156,19 @@ package org.apache.flex.mdl
{
_bottom = value;
- var newPosClazz:String;
+ var newMenuPosition:String;
- if(currentPosClazz == "")
+ if(currentMenuPosition == "")
{
- currentPosClazz = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
- className += currentPosClazz;
+ currentMenuPosition = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
+ className += currentMenuPosition;
} else
{
- newPosClazz = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
- className = className.replace( "/(?:^|\s)" + currentPosClazz + "(?!\S)/g" , newPosClazz);
+ newMenuPosition = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
+ className = className.replace( "/(?:^|\s)" + currentMenuPosition + "(?!\S)/g" , newMenuPosition);
}
- currentPosClazz = newPosClazz;
-
+ currentMenuPosition = newMenuPosition;
}
private var _left:Boolean = true;
@@ -122,19 +190,19 @@ package org.apache.flex.mdl
{
_left = value;
- var newPosClazz:String;
+ var newMenuPosition:String;
- if(currentPosClazz == "")
+ if(currentMenuPosition == "")
{
- currentPosClazz = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
- className += currentPosClazz;
+ currentMenuPosition = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
+ className += currentMenuPosition;
} else
{
- newPosClazz = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
- className = className.replace( "/(?:^|\s)" + currentPosClazz + "(?!\S)/g" , newPosClazz);
+ newMenuPosition = " mdl-menu--" + (_bottom ? "bottom" : "top") + "-" + (_left ? "left" : "right");
+ className = className.replace( "/(?:^|\s)" + currentMenuPosition + "(?!\S)/g" , newMenuPosition);
}
- currentPosClazz = newPosClazz;
+ currentMenuPosition = newMenuPosition;
}
private var _dataMdlFor:String;
@@ -181,7 +249,25 @@ package org.apache.flex.mdl
{
element.classList.toggle("mdl-js-ripple-effect", _ripple);
}
- }
+ }
+
+ public function show():void
+ {
+ COMPILE::JS
+ {
+ if (materialMenu)
+ {
+ materialMenu.show();
+ }
+ }
+ }
+
+ COMPILE::JS
+ private function onElementMdlComponentUpgraded(event:Event):void
+ {
+ if (!event.currentTarget) return;
- }
+ materialMenu = event.currentTarget.MaterialMenu;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/MenuItem.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/MenuItem.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/MenuItem.as
deleted file mode 100644
index 62881fa..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/MenuItem.as
+++ /dev/null
@@ -1,158 +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.mdl
-{
- import org.apache.flex.core.UIBase;
-
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
- /**
- * The MenuItem class creates a MDL menu item
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class MenuItem extends UIBase
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function MenuItem()
- {
- super();
-
- className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
- }
-
- private var _text:String = "";
-
- /**
- * The text of the heading
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get text():String
- {
- COMPILE::SWF
- {
- return _text;
- }
- COMPILE::JS
- {
- return textNode.nodeValue;
- }
- }
-
- public function set text(value:String):void
- {
- COMPILE::SWF
- {
- _text = value;
- }
- COMPILE::JS
- {
- textNode.nodeValue = value;
- }
- }
-
- COMPILE::JS
- private var textNode:Text;
-
- /**
- * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- */
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- typeNames = "mdl-menu__item";
-
- element = document.createElement('li') as WrappedHTMLElement;
-
- textNode = document.createTextNode('') as Text;
- element.appendChild(textNode);
-
- positioner = element;
- element.flexjs_wrapper = this;
-
- return element;
- }
-
- private var _divider:Boolean;
-
- /**
- * A boolean flag to activate "mdl-menu__item--full-bleed-divider" effect selector.
- * Modifies an item to have a full bleed divider between it and the next list item.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get divider():Boolean
- {
- return _divider;
- }
- public function set divider(value:Boolean):void
- {
- _divider = value;
-
- COMPILE::JS
- {
- element.classList.toggle("mdl-menu__item--full-bleed-divider", _divider);
- }
- }
-
- protected var _ripple:Boolean = false;
- /**
- * A boolean flag to activate "mdl-js-ripple-effect" effect selector.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get ripple():Boolean
- {
- return _ripple;
- }
- public function set ripple(value:Boolean):void
- {
- _ripple = value;
-
- COMPILE::JS
- {
- element.classList.toggle("mdl-js-ripple-effect", _ripple);
- }
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as
index 2c25502..df26c0f 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Disabled.as
@@ -43,7 +43,7 @@ package org.apache.flex.mdl.beads
public function Disabled()
{
}
-
+
private var _disabled:Boolean = true;
/**
* A boolean flag to enable or disable the host control.
@@ -59,7 +59,12 @@ package org.apache.flex.mdl.beads
}
public function set disabled(value:Boolean):void
{
- _disabled = value;
+ _disabled = value;
+
+ COMPILE::JS
+ {
+ updateHost();
+ }
}
private var _strand:IStrand;
@@ -80,8 +85,7 @@ package org.apache.flex.mdl.beads
COMPILE::JS
{
- var host:UIBase = value as UIBase;
- host.element.setAttribute('disabled', '');
+ updateHost();
/*var host:UIBase = value as UIBase;
if (host.element is HTMLInputElement)
{
@@ -96,5 +100,18 @@ package org.apache.flex.mdl.beads
//}
}
}
+
+ COMPILE::JS
+ private function updateHost():void
+ {
+ var host:UIBase = _strand as UIBase;
+
+ if (host)
+ {
+ _disabled ?
+ host.element.setAttribute('disabled', '') :
+ host.element.removeAttribute('disabled');
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as
new file mode 100644
index 0000000..d129f58
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as
@@ -0,0 +1,191 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.itemRenderers
+{
+ import org.apache.flex.html.supportClasses.MXMLItemRenderer;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The MenuItemRenderer class creates a MDL menu item
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class MenuItemRenderer extends MXMLItemRenderer
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function MenuItemRenderer()
+ {
+ super();
+
+ className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ }
+
+ private var _text:String = "";
+
+ /**
+ * The text of the heading
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get text():String
+ {
+ COMPILE::SWF
+ {
+ return _text;
+ }
+ COMPILE::JS
+ {
+ return textNode.nodeValue;
+ }
+ }
+
+ public function set text(value:String):void
+ {
+ COMPILE::SWF
+ {
+ _text = value;
+ }
+ COMPILE::JS
+ {
+ textNode.nodeValue = value;
+ }
+ }
+
+ COMPILE::JS
+ private var textNode:Text;
+
+ /**
+ * Sets the data value and uses the String version of the data for display.
+ *
+ * @param Object data The object being displayed by the itemRenderer instance.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function set data(value:Object):void
+ {
+ super.data = value;
+
+ var text:String;
+ if (labelField || dataField)
+ {
+ text = String(value[labelField]);
+ }
+ else
+ {
+ text = String(value);
+ }
+
+ COMPILE::JS
+ {
+ if(textNode != null)
+ {
+ textNode.nodeValue = text;
+ }
+ }
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ typeNames = "mdl-menu__item";
+
+ element = document.createElement('li') as WrappedHTMLElement;
+
+ textNode = document.createTextNode('') as Text;
+ element.appendChild(textNode);
+
+ positioner = element;
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+
+ private var _divider:Boolean;
+
+ /**
+ * A boolean flag to activate "mdl-menu__item--full-bleed-divider" effect selector.
+ * Modifies an item to have a full bleed divider between it and the next list item.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get divider():Boolean
+ {
+ return _divider;
+ }
+ public function set divider(value:Boolean):void
+ {
+ _divider = value;
+
+ COMPILE::JS
+ {
+ element.classList.toggle("mdl-menu__item--full-bleed-divider", _divider);
+ }
+ }
+
+ protected var _ripple:Boolean = false;
+ /**
+ * A boolean flag to activate "mdl-js-ripple-effect" effect selector.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get ripple():Boolean
+ {
+ return _ripple;
+ }
+ public function set ripple(value:Boolean):void
+ {
+ _ripple = value;
+
+ COMPILE::JS
+ {
+ element.classList.toggle("mdl-js-ripple-effect", _ripple);
+ }
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as
index dedd429..e96af4b 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as
@@ -18,7 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.supportClasses
{
- import org.apache.flex.mdl.List;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IDataProviderItemRendererMapper;
import org.apache.flex.core.IItemRendererClassFactory;
@@ -135,7 +134,7 @@ package org.apache.flex.mdl.supportClasses
*/
protected var dataGroup:IItemRendererParent;
- private function dataProviderChangeHandler(event:Event):void
+ protected function dataProviderChangeHandler(event:Event):void
{
var dp:Array = selectionModel.dataProvider as Array;
if (!dp)
@@ -149,7 +148,7 @@ package org.apache.flex.mdl.supportClasses
// This needs to be re-thought. There should be a better way to move the
// properties from the component to the renderers. At least a new interface
// should be created.
- var list:List = _strand as List;
+ var component:UIBase = _strand as UIBase;
var n:int = dp.length;
for (var i:int = 0; i < n; i++)
@@ -157,7 +156,7 @@ package org.apache.flex.mdl.supportClasses
var ir:ISelectableItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ISelectableItemRenderer;
dataGroup.addElement(ir);
ir.index = i;
- ir.labelField = list.labelField;
+ ir.labelField = component["labelField"];
if (presentationModel) {
var style:SimpleCSSStyles = new SimpleCSSStyles();
style.marginBottom = presentationModel.separatorThickness;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 681d838..b8a13b0 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -56,6 +56,16 @@ List
IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.ListItemRenderer");
}
+Menu
+{
+ IBeadView: ClassReference("org.apache.flex.mdl.beads.views.ListView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadLayout: ClassReference(null); /*"org.apache.flex.html.beads.layouts.VerticalLayout"*/
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.mdl.supportClasses.ItemRendererFactoryForArrayData");
+ IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.MenuItemRenderer");
+}
+
Toast
{
IBeadModel: ClassReference("org.apache.flex.mdl.beads.models.ToastModel");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8253a0dc/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index 601d787..eb85ca0 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -36,7 +36,7 @@
<component id="SliderMouseController" class="org.apache.flex.mdl.beads.controllers.SliderMouseController"/>
<component id="Badge" class="org.apache.flex.mdl.beads.Badge"/>
<component id="Menu" class="org.apache.flex.mdl.Menu"/>
- <component id="MenuItem" class="org.apache.flex.mdl.MenuItem"/>
+ <component id="MenuItemRenderer" class="org.apache.flex.mdl.itemRenderers.MenuItemRenderer"/>
<component id="Card" class="org.apache.flex.mdl.Card"/>
<component id="CardInner" class="org.apache.flex.mdl.supportClasses.CardInner"/>
<component id="CardTitle" class="org.apache.flex.mdl.CardTitle"/>
[33/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Remove css prefixing whitespaces in UIBase when value is empty
Posted by bi...@apache.org.
Remove css prefixing whitespaces in UIBase when value is empty
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/632b4937
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/632b4937
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/632b4937
Branch: refs/heads/feature/fontawesome
Commit: 632b4937da0b8253dc32706eb862a426ad7babd9
Parents: ffd738d
Author: Carlos Rovira <ca...@apache.org>
Authored: Tue Jan 3 19:38:48 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Tue Jan 3 19:38:48 2017 +0100
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/632b4937/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 1c825d6..b075e72 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
@@ -33,6 +33,7 @@ package org.apache.flex.core
import flash.display.InteractiveObject;
import org.apache.flex.events.utils.MouseEventConverter;
}
+ import org.apache.flex.utils.StringUtil;
/**
* Set a different class for click events so that
@@ -950,7 +951,7 @@ package org.apache.flex.core
{
COMPILE::JS
{
- setClassName(typeNames ? value + ' ' + typeNames : value);
+ setClassName(typeNames ? StringUtil.trim(value + ' ' + typeNames) : value);
}
_className = value;
dispatchEvent(new Event("classNameChanged"));
[10/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Added MDL Slider input event and rename valueChange in favor of change
Posted by bi...@apache.org.
Added MDL Slider input event and rename valueChange in favor of change
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/858d473f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/858d473f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/858d473f
Branch: refs/heads/feature/fontawesome
Commit: 858d473f3baa52eee625dc1e0e4ae1f2fd98ea9d
Parents: c103c09
Author: Carlos Rovira <ca...@apache.org>
Authored: Sat Dec 31 09:41:23 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sat Dec 31 09:41:23 2016 +0100
----------------------------------------------------------------------
.../flexjs/MDLExample/src/main/flex/Sliders.mxml | 4 ++--
.../src/main/flex/org/apache/flex/mdl/Slider.as | 4 +++-
.../mdl/beads/controllers/SliderMouseController.as | 16 ++++++++++++++--
3 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/858d473f/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
index fc9726d..81e3bd4 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
@@ -56,7 +56,7 @@ limitations under the License.
<mdl:CardTitleText id="slider1_txt"/>
</mdl:CardTitle>
<mdl:CardSupportingText>
- <mdl:Slider id="slider1" className="mdlsl_example" valueChange="onValueChange1(event)"/>
+ <mdl:Slider id="slider1" className="mdlsl_example" change="onValueChange1(event)" input="onValueChange1(event)"/>
</mdl:CardSupportingText>
</mdl:Card>
@@ -65,7 +65,7 @@ limitations under the License.
<mdl:CardTitleText id="slider2_txt"/>
</mdl:CardTitle>
<mdl:CardSupportingText>
- <mdl:Slider id="slider2" minimum="0" maximum="10" value="2" stepSize="2" width="200" valueChange="onValueChange2(event)"/>
+ <mdl:Slider id="slider2" minimum="0" maximum="10" value="2" stepSize="2" width="200" change="onValueChange2(event)" input="onValueChange2(event)"/>
</mdl:CardSupportingText>
</mdl:Card>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/858d473f/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
index b74a229..b69ac8e 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
@@ -27,7 +27,9 @@ package org.apache.flex.mdl
import org.apache.flex.core.WrappedHTMLElement;
}
- [Event(name="valueChange", type="org.apache.flex.events.Event")]
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
+ [Event(name="input", type="org.apache.flex.events.Event")]
/**
* The Slider class provides a MDL UI-like appearance for a slider.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/858d473f/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
index 876334c..a99f8f7 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
@@ -97,7 +97,7 @@ package org.apache.flex.mdl.beads.controllers
//goog.events.listen(thumb.element, goog.events.EventType.MOUSEDOWN, handleThumbDown, false, this);
goog.events.listen(UIBase(_strand).element, "change", handleChange, false, this);
- //goog.events.listen(UIBase(_strand).element, "oninput", handleTrackClick, false, this);
+ goog.events.listen(UIBase(_strand).element, "input", handleInput, false, this);
}
}
@@ -110,7 +110,19 @@ package org.apache.flex.mdl.beads.controllers
rangeModel.value = Number((UIBase(_strand).element as HTMLInputElement).value);
- host.dispatchEvent(new org.apache.flex.events.Event('valueChange'));
+ host.dispatchEvent(new org.apache.flex.events.Event('change'));
+ }
+
+ /**
+ */
+ COMPILE::JS
+ private function handleInput(event:BrowserEvent):void
+ {
+ var host:Slider = _strand as Slider;
+
+ rangeModel.value = Number((UIBase(_strand).element as HTMLInputElement).value);
+
+ host.dispatchEvent(new org.apache.flex.events.Event('input'));
}
COMPILE::SWF
[38/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Set textContent to empty string, otherwise it will show up as 'undefined'
Posted by bi...@apache.org.
Set textContent to empty string, otherwise it will show up as 'undefined'
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e17a8ff3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e17a8ff3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e17a8ff3
Branch: refs/heads/feature/fontawesome
Commit: e17a8ff3ca7a91261287a67221e4f60b11988d37
Parents: 70980a8
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Tue Jan 3 18:18:34 2017 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Tue Jan 3 18:18:34 2017 -0800
----------------------------------------------------------------------
.../FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e17a8ff3/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as
index 3c46f61..a734fde 100644
--- a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as
+++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as
@@ -70,6 +70,7 @@ package org.apache.flex.fa
var i:HTMLElement = document.createElement('i') as HTMLElement;
textNode = document.createTextNode(iconType) as Text;
+ textNode.textContent = '';
i.appendChild(textNode);
element = i as WrappedHTMLElement;
[07/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Dispatch event through the strand for Snackbar component
Posted by bi...@apache.org.
Dispatch event through the strand for Snackbar component
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/05d7456e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/05d7456e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/05d7456e
Branch: refs/heads/feature/fontawesome
Commit: 05d7456e58e6d8a008c85377489c0ee823e5f4d4
Parents: 1266625
Author: piotrz <pi...@apache.org>
Authored: Thu Dec 29 11:24:47 2016 +0100
Committer: piotrz <pi...@apache.org>
Committed: Thu Dec 29 11:24:47 2016 +0100
----------------------------------------------------------------------
.../org/apache/flex/mdl/beads/models/SnackbarModel.as | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/05d7456e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
index d86f081..635d9ed 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
@@ -18,12 +18,16 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.beads.models
{
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
public class SnackbarModel extends ToastModel implements ISnackbarModel
{
private var _actionText:String = "";
+ private var _strand:IStrand;
+
public function SnackbarModel()
{
super();
@@ -49,9 +53,14 @@ package org.apache.flex.mdl.beads.models
};
}
+ override public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ }
+
private function onActionHandler(event:Event):void
{
- dispatchEvent(new Event("action"));
+ (UIBase)(_strand).dispatchEvent(new Event("action"));
}
}
}
[22/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
add ant build for MDLExample
Posted by bi...@apache.org.
add ant build for MDLExample
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f57712e7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f57712e7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f57712e7
Branch: refs/heads/feature/fontawesome
Commit: f57712e7af13e9a7800993d28ecd59face3a9263
Parents: 1ac6951
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 2 00:05:47 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 2 00:05:57 2017 -0800
----------------------------------------------------------------------
examples/flexjs/MDLExample/build.xml | 63 +++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f57712e7/examples/flexjs/MDLExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/build.xml b/examples/flexjs/MDLExample/build.xml
new file mode 100644
index 0000000..27967de
--- /dev/null
+++ b/examples/flexjs/MDLExample/build.xml
@@ -0,0 +1,63 @@
+<?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="MDLExample" default="main" basedir=".">
+ <property name="FLEXJS_HOME" location="../../.."/>
+ <property name="example" value="App" />
+
+ <property file="${FLEXJS_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FLEXJS_HOME}/build.properties"/>
+ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <property name="opt1_arg" value="-compiler.exclude-defaults-css-files=HTML-0.8.0-SNAPSHOT.swc:defaults.css" />
+ <property name="opt2_arg" value="-html-template=${basedir}/src/main/resources/mdl-js-index-template.html" />
+
+ <include file="${basedir}/../../build_example.xml" />
+
+ <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
+ <mkdir dir="${basedir}/bin/js-debug/assets" />
+ <copy todir="${basedir}/bin/js-debug/assets" >
+ <fileset dir="${basedir}/src/main/resources/assets">
+ <include name="**" />
+ </fileset>
+ </copy>
+ <mkdir dir="${basedir}/bin/js-release/assets" />
+ <copy todir="${basedir}/bin/js-release/assets" >
+ <fileset dir="${basedir}/src/main/resources/assets">
+ <include name="**" />
+ </fileset>
+ </copy>
+ <replace file="${basedir}/bin/js-debug/index.html" token="${primary}" value="indigo" />
+ <replace file="${basedir}/bin/js-debug/index.html" token="${accent}" value="pink" />
+ <replace file="${basedir}/bin/js-release/index.html" token="${primary}" value="indigo" />
+ <replace file="${basedir}/bin/js-release/index.html" token="${accent}" value="pink" />
+ </target>
+
+ <target name="clean">
+ <delete dir="${basedir}/bin" failonerror="false" />
+ <delete dir="${basedir}/bin-debug" failonerror="false" />
+ <delete dir="${basedir}/bin-release" failonerror="false" />
+ <delete dir="${basedir}/target" failonerror="false" />
+ </target>
+
+
+
+</project>
[05/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
MDL Sliders panel with examples
Posted by bi...@apache.org.
MDL Sliders panel with examples
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a73aec3a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a73aec3a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a73aec3a
Branch: refs/heads/feature/fontawesome
Commit: a73aec3a9f12b41a6829afe5c5ecdaf1b20b59f4
Parents: 23e8320
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Dec 28 18:40:55 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Dec 28 18:40:55 2016 +0100
----------------------------------------------------------------------
.../flexjs/MDLExample/src/main/flex/Cards.mxml | 15 +---
.../src/main/flex/MainNavigation.mxml | 6 +-
.../MDLExample/src/main/flex/Sliders.mxml | 82 ++++++++++++++++++++
3 files changed, 88 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a73aec3a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
index e81715d..afb3a82 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
@@ -21,17 +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">
-
- <fx:Script>
- <![CDATA[
- private function onValueChange(event:Event):void
- {
- trace("value change:", slider.value);
- mycard.shadow = slider.value
- }
- ]]>
-</fx:Script>
-
+
<mdl:Grid className="center-items">
<mdl:Card id="mycard" className="demo-card-wide" shadow="2">
@@ -47,8 +37,7 @@ limitations under the License.
</mdl:CardSupportingText>
<mdl:CardActions border="true">
<mdl:Button text="Get Started" ripple="true" colored="true"/>
- <mdl:Slider id="slider" minimum="0" maximum="16" value="2" stepSize="1" width="200"
- valueChange="onValueChange(event)"/>
+
</mdl:CardActions>
<mdl:CardMenu>
<mdl:Button icon="true" ripple="true">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a73aec3a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
index a73559d..e93cc70 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -37,6 +37,7 @@ limitations under the License.
<mdl:TabBar ripple="true">
<mdl:TabBarButton text="Cards" href="#cards_panel" isActive="true"/>
<mdl:TabBarButton text="Chips" href="#chips_panel"/>
+ <mdl:TabBarButton text="Sliders" href="#sliders_panel"/>
<mdl:TabBarButton text="Grids" href="#grids_panel"/>
<mdl:TabBarButton text="Tabs" href="#tabs_panel"/>
<mdl:TabBarButton text="Buttons" href="#buttons_panel" />
@@ -68,6 +69,8 @@ limitations under the License.
<local:Cards id="cards_panel" isActive="true"/>
<local:Chips id="chips_panel" />
+
+ <local:Sliders id="sliders_panel" />
<local:Grids id="grids_panel"/>
@@ -116,6 +119,7 @@ limitations under the License.
<mdl:MaterialIconMoreVert/>
</mdl:materialIcon>
</mdl:Button>
+
<mdl:Menu dataMdlFor="menu_btn" ripple="true" bottom="true" left="false">
<mdl:MenuItem text="Some Action"/>
<mdl:MenuItem text="Another Action"/>
@@ -128,8 +132,6 @@ limitations under the License.
<mdl:MenuItem text="Separated Action"/>
</mdl:Menu>
- <mdl:Slider className="mdlsl_example"/>
- <mdl:Slider minimum="0" maximum="10" value="2" stepSize="2" width="200"/>
</mdl:TabBarPanel>
</mdl:NavigationLayoutContent>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a73aec3a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
new file mode 100644
index 0000000..025bca8
--- /dev/null
+++ b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
@@ -0,0 +1,82 @@
+<?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.
+
+-->
+<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl"
+ initComplete="initTextBoxes(event)">
+
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.events.Event;
+
+ private function initTextBoxes(event:Event):void
+ {
+ slider1_txt.text = "Slider 1 Value: " + slider1.value;
+ slider2_txt.text = "Slider 2 Value: " + slider2.value;
+ slider3_txt.text = "Disabled";
+ }
+
+ private function onValueChange1(event:Event):void
+ {
+ trace("value 1 change: " + slider1.value);
+ slider1_txt.text = "Slider 1 Value: " + slider1.value;
+ }
+
+ private function onValueChange2(event:Event):void
+ {
+ trace("value 2 change: " + slider2.value);
+ slider2_txt.text = "Slider 2 Value: " + slider2.value;
+ }
+ ]]>
+ </fx:Script>
+
+ <mdl:Grid>
+ <mdl:GridCell>
+ <mdl:Slider id="slider1" className="mdlsl_example" valueChange="onValueChange1(event)"/>
+ <!--<mdl:Slider id="slider1" minimum="0" maximum="16" value="2" stepSize="1" width="200"
+ valueChange="onValueChange(event)"/>-->
+ </mdl:GridCell>
+ <mdl:GridCell>
+ <mdl:Slider id="slider2" minimum="0" maximum="10" value="2" stepSize="2" width="200"
+ valueChange="onValueChange2(event)"/>
+ </mdl:GridCell>
+
+ <mdl:GridCell>
+ <mdl:Slider minimum="0" maximum="10" value="2" stepSize="2" width="200">
+ <mdl:beads>
+ <mdl:Disabled/>
+ </mdl:beads>
+ </mdl:Slider>
+ </mdl:GridCell>
+
+ <mdl:GridCell>
+ <js:Span id="slider1_txt"/>
+ </mdl:GridCell>
+
+ <mdl:GridCell>
+ <js:Span id="slider2_txt"/>
+ </mdl:GridCell>
+
+ <mdl:GridCell>
+ <js:Span id="slider3_txt"/>
+ </mdl:GridCell>
+ </mdl:Grid>
+
+</mdl:TabBarPanel>
[13/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
TextArea maxrows and disabled textfield example
Posted by bi...@apache.org.
TextArea maxrows and disabled textfield example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b31b86f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b31b86f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b31b86f6
Branch: refs/heads/feature/fontawesome
Commit: b31b86f6556bd3286b95ff1d6276dabf21b4e24f
Parents: bcc0953
Author: Carlos Rovira <ca...@apache.org>
Authored: Sun Jan 1 19:37:58 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sun Jan 1 19:37:58 2017 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/TextFields.mxml | 12 ++++++++--
.../main/flex/org/apache/flex/mdl/TextArea.as | 24 ++++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b31b86f6/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
index acac84b..9cbf2ae 100644
--- a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml
@@ -30,6 +30,14 @@ limitations under the License.
<mdl:TextField id="mdlti" change="mdlfloatingti.text = mdlti.text" width="100%">
<mdl:beads>
<mdl:TextPrompt prompt="Normal Text Field..."/>
+ <mdl:Tooltip text="A simple tooltip in a TextField"/>
+ </mdl:beads>
+ </mdl:TextField>
+
+ <mdl:TextField width="100%">
+ <mdl:beads>
+ <mdl:Disabled/>
+ <mdl:TextPrompt prompt="Disabled..."/>
</mdl:beads>
</mdl:TextField>
@@ -66,9 +74,9 @@ limitations under the License.
</mdl:beads>
</mdl:TextArea>
- <mdl:TextArea floatingLabel="true" width="100%" rows="5">
+ <mdl:TextArea floatingLabel="true" width="100%" rows="5" maxrows="8">
<mdl:beads>
- <mdl:TextPrompt prompt="Text lines, floating and only letters..."/>
+ <mdl:TextPrompt prompt="Floating, maxrows 8 and only letters..."/>
<mdl:Restrict pattern="[A-Z,a-z, ]*" error="Letters and spaces only"/>
</mdl:beads>
</mdl:TextArea>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b31b86f6/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
index dda2668..167485f 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextArea.as
@@ -77,6 +77,29 @@ package org.apache.flex.mdl
}
}
+ private var _maxrows:int = 0;
+ /**
+ * The max number of rows in the textarea. Defaults to 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get maxrows():int
+ {
+ return _maxrows;
+ }
+ public function set maxrows(value:int):void
+ {
+ _maxrows = value;
+
+ COMPILE::JS
+ {
+ input.setAttribute('maxrows', _maxrows);
+ }
+ }
+
COMPILE::JS
{
private var _textNode:Text;
@@ -134,6 +157,7 @@ package org.apache.flex.mdl
input = document.createElement('textarea') as HTMLInputElement;
input.setAttribute('type', 'text');
input.setAttribute('rows', rows);
+ //input.setAttribute('maxrows', maxrows);
input.className = "mdl-textfield__input";
//attach input handler to dispatch flexjs change event when user write in textinput
[06/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Some changes to get the same output as MDL web site samples thanks to latest
changes
Posted by bi...@apache.org.
Some changes to get the same output as MDL web site samples thanks to latest 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/1266625d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1266625d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1266625d
Branch: refs/heads/feature/fontawesome
Commit: 1266625d704fd302addd609fdedbeeba4dc61604
Parents: a73aec3
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Dec 28 19:48:13 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Dec 28 19:48:13 2016 +0100
----------------------------------------------------------------------
.../flexjs/MDLExample/src/main/flex/Grids.mxml | 59 ++++++++++----------
.../MDLExample/src/main/flex/Sliders.mxml | 58 ++++++++++---------
.../src/main/resources/mdl-styles.css | 9 +++
.../src/main/flex/org/apache/flex/html/Div.as | 51 +++++++----------
.../src/main/flex/org/apache/flex/html/Span.as | 2 +-
5 files changed, 92 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1266625d/examples/flexjs/MDLExample/src/main/flex/Grids.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Grids.mxml b/examples/flexjs/MDLExample/src/main/flex/Grids.mxml
index b22b813..226b994 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Grids.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Grids.mxml
@@ -22,33 +22,36 @@ limitations under the License.
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml">
- <mdl:Grid className="demo-grid">
+ <js:Div className="demo-grid">
+
+ <mdl:Grid>
+
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="1"><mdl:beads><js:InnerHTML text="1"/></mdl:beads></mdl:GridCell>
+
+ <mdl:GridCell column="4"><mdl:beads><js:InnerHTML text="4"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="4"><mdl:beads><js:InnerHTML text="4"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="4"><mdl:beads><js:InnerHTML text="4"/></mdl:beads></mdl:GridCell>
+
+ <mdl:GridCell column="6"><mdl:beads><js:InnerHTML text="6"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="4"><mdl:beads><js:InnerHTML text="4"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="2"><mdl:beads><js:InnerHTML text="2"/></mdl:beads></mdl:GridCell>
+
+ <mdl:GridCell column="6" columnTablet="8"><mdl:beads><js:InnerHTML text="6 (8 Tablet)"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="4" columnTablet="6"><mdl:beads><js:InnerHTML text="4 (6 Tablet)"/></mdl:beads></mdl:GridCell>
+ <mdl:GridCell column="2" columnPhone="4"><mdl:beads><js:InnerHTML text="2 (4 Phone)"/></mdl:beads></mdl:GridCell>
+
+ </mdl:Grid>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
- <mdl:GridCell column="1"><js:Label text="1"/></mdl:GridCell>
-
- <mdl:GridCell column="4"><js:Label text="4"/></mdl:GridCell>
- <mdl:GridCell column="4"><js:Label text="4"/></mdl:GridCell>
- <mdl:GridCell column="4"><js:Label text="4"/></mdl:GridCell>
-
- <mdl:GridCell column="6"><js:Label text="6"/></mdl:GridCell>
- <mdl:GridCell column="4"><js:Label text="4"/></mdl:GridCell>
- <mdl:GridCell column="2"><js:Label text="2"/></mdl:GridCell>
-
- <mdl:GridCell column="6" columnTablet="8"><js:Label text="6 (8 Tablet)"/></mdl:GridCell>
- <mdl:GridCell column="4" columnTablet="6"><js:Label text="4 (6 Tablet)"/></mdl:GridCell>
- <mdl:GridCell column="2" columnPhone="4"><js:Label text="2 (4 Phone)"/></mdl:GridCell>
-
- </mdl:Grid>
-
+ </js:Div>
</mdl:TabBarPanel>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1266625d/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
index 025bca8..bc8fead 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Sliders.mxml
@@ -47,36 +47,42 @@ limitations under the License.
]]>
</fx:Script>
- <mdl:Grid>
- <mdl:GridCell>
- <mdl:Slider id="slider1" className="mdlsl_example" valueChange="onValueChange1(event)"/>
- <!--<mdl:Slider id="slider1" minimum="0" maximum="16" value="2" stepSize="1" width="200"
+ <!--<mdl:Slider id="slider1" minimum="0" maximum="16" value="2" stepSize="1" width="200"
valueChange="onValueChange(event)"/>-->
- </mdl:GridCell>
- <mdl:GridCell>
- <mdl:Slider id="slider2" minimum="0" maximum="10" value="2" stepSize="2" width="200"
- valueChange="onValueChange2(event)"/>
- </mdl:GridCell>
-
- <mdl:GridCell>
- <mdl:Slider minimum="0" maximum="10" value="2" stepSize="2" width="200">
- <mdl:beads>
- <mdl:Disabled/>
- </mdl:beads>
- </mdl:Slider>
- </mdl:GridCell>
- <mdl:GridCell>
- <js:Span id="slider1_txt"/>
- </mdl:GridCell>
+ <mdl:Grid>
+
+ <mdl:Card className="demo-card-slider" shadow="2">
+ <mdl:CardTitle>
+ <mdl:CardTitleText id="slider1_txt"/>
+ </mdl:CardTitle>
+ <mdl:CardSupportingText>
+ <mdl:Slider id="slider1" className="mdlsl_example" valueChange="onValueChange1(event)"/>
+ </mdl:CardSupportingText>
+ </mdl:Card>
- <mdl:GridCell>
- <js:Span id="slider2_txt"/>
- </mdl:GridCell>
+ <mdl:Card className="demo-card-slider" shadow="2">
+ <mdl:CardTitle>
+ <mdl:CardTitleText id="slider2_txt"/>
+ </mdl:CardTitle>
+ <mdl:CardSupportingText>
+ <mdl:Slider id="slider2" minimum="0" maximum="10" value="2" stepSize="2" width="200" valueChange="onValueChange2(event)"/>
+ </mdl:CardSupportingText>
+ </mdl:Card>
- <mdl:GridCell>
- <js:Span id="slider3_txt"/>
- </mdl:GridCell>
+ <mdl:Card className="demo-card-slider" shadow="2">
+ <mdl:CardTitle>
+ <mdl:CardTitleText id="slider3_txt"/>
+ </mdl:CardTitle>
+ <mdl:CardSupportingText>
+ <mdl:Slider minimum="0" maximum="10" value="2" stepSize="2" width="200">
+ <mdl:beads>
+ <mdl:Disabled/>
+ </mdl:beads>
+ </mdl:Slider>
+ </mdl:CardSupportingText>
+ </mdl:Card>
+
</mdl:Grid>
</mdl:TabBarPanel>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1266625d/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
index 169b01d..176b565 100644
--- a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
+++ b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
@@ -136,7 +136,16 @@ js|Image
color: #fff;
}
+/* sliders demo */
+.demo-card-slider.mdl-card {
+ width: 250px;
+ height: 50px;
+ background: #fff;
+ color: #000;
+ margin: 4px;
+}
+/* Grids Example */
.demo-grid .mdl-cell {
box-sizing: border-box;
background-color: #BDBDBD;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1266625d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
index 8fd692f..5c95172 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Div.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html
{
- import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ContainerBase;
COMPILE::JS
{
@@ -35,7 +35,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Div extends UIBase
+ public class Div extends ContainerBase
{
/**
* constructor.
@@ -53,7 +53,7 @@ package org.apache.flex.html
private var _text:String = "";
/**
- * The text of the heading
+ * The text of the div
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -62,51 +62,38 @@ package org.apache.flex.html
*/
public function get text():String
{
- COMPILE::SWF
- {
- return _text;
- }
- COMPILE::JS
- {
- return textNode.nodeValue;
- }
+ return _text;
}
-
public function set text(value:String):void
{
- COMPILE::SWF
- {
- _text = value;
- }
- COMPILE::JS
- {
- textNode.nodeValue = value;
- }
+ _text = value;
+
+ COMPILE::JS
+ {
+ if(textNode == null)
+ {
+ textNode = document.createTextNode('') as Text;
+ element.appendChild(textNode);
+ }
+
+ textNode.nodeValue = value;
+ }
}
COMPILE::JS
- private var textNode:Text;
+ protected var textNode:Text;
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- * @flexjsignorecoercion HTMLDivElement
*/
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
- var div:HTMLElement = document.createElement('div') as HTMLDivElement;
-
- textNode = document.createTextNode('') as Text;
- div.appendChild(textNode);
+ element = document.createElement('div') as WrappedHTMLElement;
- element = div as WrappedHTMLElement;
-
positioner = element;
- positioner.style.position = 'relative';
- element.flexjs_wrapper = this;
+ element.flexjs_wrapper = this;
- //className = typeNames = 'Div';
-
return element;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1266625d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
index 606906c..0bc8e3e 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
@@ -53,7 +53,7 @@ package org.apache.flex.html
private var _text:String = "";
/**
- * The text of the heading
+ * The text of the span
*
* @langversion 3.0
* @playerversion Flash 10.2
[23/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Add separate Tab for Menu - move menu from Others Tab
Posted by bi...@apache.org.
Add separate Tab for Menu - move menu from Others Tab
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/084232f1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/084232f1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/084232f1
Branch: refs/heads/feature/fontawesome
Commit: 084232f13fb5c1ff51dd28bf9d54bcecc39c67f9
Parents: f57712e
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 2 09:33:05 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 2 09:33:05 2017 +0100
----------------------------------------------------------------------
.../src/main/flex/MainNavigation.mxml | 24 ++---------
.../flexjs/MDLExample/src/main/flex/Menus.mxml | 45 ++++++++++++++++++++
2 files changed, 48 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/084232f1/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
index 5527d73..ee1a583 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -23,10 +23,6 @@ limitations under the License.
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml" xmlns:models="models.*"
fixedHeader="true">
- <mdl:model>
- <models:MenuModel id="menuModel"/>
- </mdl:model>
-
<mdl:Header>
<mdl:HeaderRow>
<mdl:LayoutTitle text="FlexJS Material Design Layout"/>
@@ -50,6 +46,7 @@ limitations under the License.
<mdl:TabBarButton text="Toggles" href="#toggles_panel"/>
<mdl:TabBarButton text="Lists" href="#lists_panel"/>
<mdl:TabBarButton text="Loading" href="#loading_panel"/>
+ <mdl:TabBarButton text="Menu" href="#menus_panel"/>
<mdl:TabBarButton text="Other" href="#others_panel"/>
</mdl:TabBar>
</mdl:Header>
@@ -92,6 +89,8 @@ limitations under the License.
<local:Loading id="loading_panel"/>
+ <local:Menus id="menus_panel"/>
+
<mdl:TabBarPanel id="others_panel">
<js:Div text="account_box" className="material-icons" style="color: rgba(0, 0, 0, 0.24);">
@@ -117,23 +116,6 @@ limitations under the License.
<mdl:Badge dataBadge="1"/>
</js:beads>
</js:A>
-
- <mdl:Button id="menu_btn" icon="true">
- <mdl:materialIcon>
- <mdl:MaterialIconMoreVert/>
- </mdl:materialIcon>
- </mdl:Button>
-
- <mdl:Menu dataMdlFor="menu_btn" ripple="true" bottom="true" left="false"
- labelField="label" className="customMenuItemRenderer">
- <mdl:beads>
- <js:ConstantBinding
- sourceID="menuModel"
- sourcePropertyName="menuItems"
- destinationPropertyName="dataProvider" />
- </mdl:beads>
- </mdl:Menu>
-
</mdl:TabBarPanel>
</mdl:NavigationLayoutContent>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/084232f1/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Menus.mxml b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
new file mode 100644
index 0000000..50e9735
--- /dev/null
+++ b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
@@ -0,0 +1,45 @@
+<?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.
+
+-->
+<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ xmlns:models="models.*">
+ <mdl:model>
+ <models:MenuModel id="menuModel"/>
+ </mdl:model>
+
+ <mdl:Grid width="100">
+ <mdl:Button id="menu_btn" icon="true">
+ <mdl:materialIcon>
+ <mdl:MaterialIconMoreVert/>
+ </mdl:materialIcon>
+ </mdl:Button>
+
+ <mdl:Menu dataMdlFor="menu_btn" ripple="true" bottom="true" left="false"
+ labelField="label" className="customMenuItemRenderer">
+ <mdl:beads>
+ <js:ConstantBinding
+ sourceID="menuModel"
+ sourcePropertyName="menuItems"
+ destinationPropertyName="dataProvider" />
+ </mdl:beads>
+ </mdl:Menu>
+ </mdl:Grid>
+</mdl:TabBarPanel>
[03/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - -
Extend SnackbarModel by ToastModel - Fix UI in example
Posted by bi...@apache.org.
- Extend SnackbarModel by ToastModel
- Fix UI in example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d0a69eb8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d0a69eb8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d0a69eb8
Branch: refs/heads/feature/fontawesome
Commit: d0a69eb896345628c34cc2bf22252a3f99084c0f
Parents: 79db074
Author: piotrz <pi...@apache.org>
Authored: Wed Dec 28 15:30:13 2016 +0100
Committer: piotrz <pi...@apache.org>
Committed: Wed Dec 28 15:30:13 2016 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/Snackbar.mxml | 8 ++--
.../main/flex/org/apache/flex/mdl/Snackbar.as | 22 +----------
.../flex/mdl/beads/models/SnackbarModel.as | 39 ++------------------
3 files changed, 9 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d0a69eb8/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml b/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
index fb46676..753fae5 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml
@@ -20,14 +20,14 @@ limitations under the License.
<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mdl="library://ns.apache.org/flexjs/mdl">
<mdl:Grid>
- <mdl:GridCell column="1">
+ <mdl:GridCell column="1" width="200">
<mdl:Button id="showToast" click="onShowToastClick(event)"
- text="Show Toast!" width="200" accent="true" colored="true" raised="true"/>
+ text="Show Toast!" width="180" accent="true" colored="true" raised="true"/>
<mdl:Toast id="toast" message="Toast message" timeout="3000"/>
</mdl:GridCell>
- <mdl:GridCell column="1">
+ <mdl:GridCell column="2" width="200">
<mdl:Button id="showSnackbar" click="onShowSnackbarClick(event)"
- text="Show !" width="200" accent="true" colored="true" raised="true"/>
+ text="Show Snackbar!" width="180" accent="true" colored="true" raised="true"/>
<mdl:Snackbar id="snackbar" message="Snackbar message" actionText="Undo" timeout="3000"
action="onSnackBarAction(event)"/>
</mdl:GridCell>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d0a69eb8/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
index f4b2944..7d8fb92 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as
@@ -61,27 +61,7 @@ package org.apache.flex.mdl
{
super();
}
-
- override public function get message():String
- {
- return ISnackbarModel(model).message;
- }
-
- override public function set message(value:String):void
- {
- ISnackbarModel(model).message = value;
- }
-
- override public function get timeout():int
- {
- return ISnackbarModel(model).timeout;
- }
-
- override public function set timeout(value:int):void
- {
- ISnackbarModel(model).timeout = value;
- }
-
+
public function get actionText():String
{
return ISnackbarModel(model).actionText;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d0a69eb8/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
index be182fd..d86f081 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as
@@ -18,42 +18,16 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.beads.models
{
- import org.apache.flex.core.IStrand;
- import org.apache.flex.events.EventDispatcher;
import org.apache.flex.events.Event;
- public class SnackbarModel extends EventDispatcher implements ISnackbarModel
+ public class SnackbarModel extends ToastModel implements ISnackbarModel
{
- private var _message:String = "";
- private var _timeout:int = 2750;
private var _actionText:String = "";
- private var _strand:IStrand;
-
public function SnackbarModel()
{
super();
}
-
- public function get message():String
- {
- return _message;
- }
-
- public function set message(value:String):void
- {
- _message = value;
- }
-
- public function get timeout():int
- {
- return _timeout;
- }
-
- public function set timeout(value:int):void
- {
- _timeout = value;
- }
public function get actionText():String
{
@@ -65,21 +39,16 @@ package org.apache.flex.mdl.beads.models
_actionText = value;
}
- public function get snackbarData():Object
+ override public function get snackbarData():Object
{
return {
- message: _message,
- timeout: _timeout,
+ message: message,
+ timeout: timeout,
actionHandler: onActionHandler,
actionText: _actionText
};
}
- public function set strand(value:IStrand):void
- {
- _strand = value;
- }
-
private function onActionHandler(event:Event):void
{
dispatchEvent(new Event("action"));
[19/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Remove parts related to sub menus
Posted by bi...@apache.org.
Remove parts related to sub menus
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9888a41e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9888a41e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9888a41e
Branch: refs/heads/feature/fontawesome
Commit: 9888a41e584841754f8587bb467ea33d418cc2d8
Parents: dc2aef2
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 2 08:32:08 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 2 08:32:08 2017 +0100
----------------------------------------------------------------------
.../itemRenderers/CustomMenuItemRenderer.mxml | 37 ++------------------
.../src/main/flex/models/MenuModel.as | 13 +------
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 14 +-------
.../src/main/flex/org/apache/flex/mdl/Menu.as | 23 ------------
4 files changed, 5 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
index 25b55ca..3eb4636 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
@@ -18,17 +18,11 @@ limitations under the License.
-->
<mdl:MenuItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:models="models.*"
- xmlns:js="library://ns.apache.org/flexjs/basic" rollOver="onMenuItemRollOver(event)">
- <mdl:model>
- <models:MenuModel id="subMenuModel"/>
- </mdl:model>
- <mdl:beads>
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl">
+ <!--<mdl:beads>
<mdl:Disabled disabled="{menuItem.disabled}"/>
- </mdl:beads>
+ </mdl:beads> -->
<fx:Script><![CDATA[
- import org.apache.flex.events.MouseEvent;
-
import vos.MenuItemVO;
[Bindable("dataChange")]
@@ -37,30 +31,5 @@ limitations under the License.
return data as MenuItemVO;
}
- override public function set data(value:Object):void
- {
- super.data = value;
-
- if (value && value.hasSubMenu)
- {
- id = "subMenu";
- }
- }
-
- private function onMenuItemRollOver(event:MouseEvent):void
- {
- if (menuItem.hasSubMenu)
- {
- subMenu.show();
- }
- }
]]></fx:Script>
- <mdl:Menu id="subMenu" dataMdlFor="subMenu" left="true" labelField="label">
- <mdl:beads>
- <js:ConstantBinding
- sourceID="subMenuModel"
- sourcePropertyName="subMenuItems"
- destinationPropertyName="dataProvider" />
- </mdl:beads>
- </mdl:Menu>
</mdl:MenuItemRenderer>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
index 382a512..a68f8b9 100644
--- a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
+++ b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
@@ -28,23 +28,12 @@ package models
private var _menuItems:Array = [
new MenuItemVO("Some Action"),
new MenuItemVO("Another Action"),
- new MenuItemVO("More Action", false, true)
+ new MenuItemVO("More Action", false)
];
-
- private var _subMenuItems:Array = [
- new MenuItemVO("Sub Menu Action"),
- new MenuItemVO("Sub Menu Action"),
- new MenuItemVO("Sub Menu Action")
- ]
public function get menuItems():Array
{
return _menuItems;
}
-
- public function get subMenuItems():Array
- {
- return _subMenuItems;
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
index 13f983b..414fe10 100644
--- a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -22,13 +22,11 @@ package vos
{
private var _label:String;
private var _disabled:Boolean;
- private var _hasSubMenu:Boolean;
- public function MenuItemVO(label:String, disabled:Boolean = false, hasSubMenu:Boolean = false)
+ public function MenuItemVO(label:String, disabled:Boolean = false)
{
this.label = label;
this.disabled = disabled;
- this.hasSubMenu = hasSubMenu;
}
public function get label():String
@@ -50,15 +48,5 @@ package vos
{
_disabled = value;
}
-
- public function get hasSubMenu():Boolean
- {
- return _hasSubMenu;
- }
-
- public function set hasSubMenu(value:Boolean):void
- {
- _hasSubMenu = value;
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/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 35ff07e..77df29a 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
@@ -29,7 +29,6 @@ package org.apache.flex.mdl
COMPILE::JS
{
- import org.apache.flex.events.Event;
import org.apache.flex.core.WrappedHTMLElement;
}
@@ -58,8 +57,6 @@ package org.apache.flex.mdl
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
}
- COMPILE::JS
- private var materialMenu:Object;
/**
* default position for Menu in MDL is bottom/left (or no class selector specified)
*
@@ -128,7 +125,6 @@ package org.apache.flex.mdl
typeNames = "mdl-menu mdl-js-menu";
element = document.createElement('ul') as WrappedHTMLElement;
- element.addEventListener("mdl-componentupgraded", onElementMdlComponentUpgraded, false);
positioner = element;
element.flexjs_wrapper = this;
@@ -250,24 +246,5 @@ package org.apache.flex.mdl
element.classList.toggle("mdl-js-ripple-effect", _ripple);
}
}
-
- public function show():void
- {
- COMPILE::JS
- {
- if (materialMenu)
- {
- materialMenu.show();
- }
- }
- }
-
- COMPILE::JS
- private function onElementMdlComponentUpgraded(event:Event):void
- {
- if (!event.currentTarget) return;
-
- materialMenu = event.currentTarget.MaterialMenu;
- }
}
}
[18/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Mdl icon arrow down
Posted by bi...@apache.org.
Mdl icon arrow down
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dc2aef23
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dc2aef23
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dc2aef23
Branch: refs/heads/feature/fontawesome
Commit: dc2aef23fd1d2c886c55ecf65a4d1ebdf0953eb7
Parents: 8253a0d
Author: Carlos Rovira <ca...@apache.org>
Authored: Mon Jan 2 01:34:08 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Mon Jan 2 01:34:08 2017 +0100
----------------------------------------------------------------------
.../MDLExample/src/main/flex/Buttons.mxml | 14 ++++--
.../MaterialIconKeyboardArrowDown.as | 52 ++++++++++++++++++++
.../flex/mdl/materialIcons/MaterialIconsType.as | 1 +
.../src/main/resources/mdl-manifest.xml | 21 ++++----
4 files changed, 75 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc2aef23/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
index 0be4e70..a72ad48 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
@@ -24,10 +24,10 @@ limitations under the License.
<!-- Buttons https://getmdl.io/components/index.html#buttons-section -->
<mdl:Grid width="100">
- <mdl:Button className="mdlbtn" style="display:block;"/>
+ <mdl:Button className="mdlbtn"/>
<!-- Fab button -->
- <mdl:Button id="mybtn" fab="true" colored="true" style="display:block;">
+ <mdl:Button id="mybtn" fab="true" colored="true">
<mdl:beads>
<mdl:Tooltip text="A simple tooltip"/>
</mdl:beads>
@@ -35,16 +35,22 @@ limitations under the License.
<mdl:MaterialIconAdd/>
</mdl:materialIcon>
</mdl:Button>
+
+ <mdl:Button fab="true" colored="true">
+ <mdl:materialIcon>
+ <mdl:MaterialIconKeyboardArrowDown/>
+ </mdl:materialIcon>
+ </mdl:Button>
<!-- Fab with Ripple -->
- <mdl:Button fab="true" ripple="true" style="display:block;">
+ <mdl:Button fab="true" ripple="true">
<mdl:materialIcon>
<mdl:MaterialIconFace size="48"/>
</mdl:materialIcon>
</mdl:Button>
<!-- Raised button -->
- <mdl:Button text="COLORED" raised="true" colored="true" style="display:block;"/>
+ <mdl:Button text="COLORED" raised="true" colored="true"/>
<!-- Raised button with ripple -->
<mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc2aef23/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as
new file mode 100644
index 0000000..234e0db
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as
@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl.materialIcons
+{
+ import org.apache.flex.mdl.supportClasses.MaterialIconBase;
+
+ /**
+ * The MaterialIconKeyboardArrowDown bead class is a specialty bead that add "keyboard_arrow_down" icon
+ * to component taken from "material-icons"
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class MaterialIconKeyboardArrowDown extends MaterialIconBase
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function MaterialIconKeyboardArrowDown()
+ {
+ super();
+ }
+
+ override protected function get iconText():String
+ {
+ return MaterialIconsType.KEYBOARD_ARROW_DOWN;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc2aef23/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
index 1174287..3eea71d 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as
@@ -29,5 +29,6 @@ package org.apache.flex.mdl.materialIcons
public static const FACE:String = "face";
public static const MORE_VERT:String = "more_vert";
public static const SEARCH:String = "search";
+ public static const KEYBOARD_ARROW_DOWN:String = "keyboard_arrow_down";
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dc2aef23/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index eb85ca0..b3d00cf 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -75,15 +75,6 @@
<component id="ButtonChip" class="org.apache.flex.mdl.ButtonChip"/>
<component id="DeletableChip" class="org.apache.flex.mdl.beads.DeletableChip"/>
<component id="DeletableLinkChip" class="org.apache.flex.mdl.beads.DeletableLinkChip"/>
- <component id="MaterialIconCancel" class="org.apache.flex.mdl.materialIcons.MaterialIconCancel"/>
- <component id="MaterialIconAdd" class="org.apache.flex.mdl.materialIcons.MaterialIconAdd"/>
- <component id="MaterialIconPerson" class="org.apache.flex.mdl.materialIcons.MaterialIconPerson"/>
- <component id="MaterialIconStar" class="org.apache.flex.mdl.materialIcons.MaterialIconStar"/>
- <component id="MaterialIconShare" class="org.apache.flex.mdl.materialIcons.MaterialIconShare"/>
- <component id="MaterialIconEvent" class="org.apache.flex.mdl.materialIcons.MaterialIconEvent"/>
- <component id="MaterialIconFace" class="org.apache.flex.mdl.materialIcons.MaterialIconFace"/>
- <component id="MaterialIconMoreVert" class="org.apache.flex.mdl.materialIcons.MaterialIconMoreVert"/>
- <component id="MaterialIconSearch" class="org.apache.flex.mdl.materialIcons.MaterialIconSearch"/>
<component id="ContactChip" class="org.apache.flex.mdl.beads.ContactChip"/>
<component id="ContactImageChip" class="org.apache.flex.mdl.beads.ContactImageChip"/>
<component id="Tooltip" class="org.apache.flex.mdl.beads.Tooltip"/>
@@ -95,4 +86,16 @@
<component id="Toast" class="org.apache.flex.mdl.Toast"/>
<component id="SnackbarModel" class="org.apache.flex.mdl.beads.models.SnackbarModel"/>
<component id="Snackbar" class="org.apache.flex.mdl.Snackbar"/>
+
+ <component id="MaterialIconCancel" class="org.apache.flex.mdl.materialIcons.MaterialIconCancel"/>
+ <component id="MaterialIconAdd" class="org.apache.flex.mdl.materialIcons.MaterialIconAdd"/>
+ <component id="MaterialIconPerson" class="org.apache.flex.mdl.materialIcons.MaterialIconPerson"/>
+ <component id="MaterialIconStar" class="org.apache.flex.mdl.materialIcons.MaterialIconStar"/>
+ <component id="MaterialIconShare" class="org.apache.flex.mdl.materialIcons.MaterialIconShare"/>
+ <component id="MaterialIconEvent" class="org.apache.flex.mdl.materialIcons.MaterialIconEvent"/>
+ <component id="MaterialIconFace" class="org.apache.flex.mdl.materialIcons.MaterialIconFace"/>
+ <component id="MaterialIconMoreVert" class="org.apache.flex.mdl.materialIcons.MaterialIconMoreVert"/>
+ <component id="MaterialIconSearch" class="org.apache.flex.mdl.materialIcons.MaterialIconSearch"/>
+ <component id="MaterialIconKeyboardArrowDown" class="org.apache.flex.mdl.materialIcons.MaterialIconKeyboardArrowDown"/>
+
</componentPackage>
[24/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Remove warnings related to Bindings - Make MenuItemVO Bindable
Posted by bi...@apache.org.
Remove warnings related to Bindings
- Make MenuItemVO Bindable
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b544583a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b544583a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b544583a
Branch: refs/heads/feature/fontawesome
Commit: b544583a2acc69ac647fa1abf04339db6422efef
Parents: 084232f
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 2 09:39:48 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 2 09:39:48 2017 +0100
----------------------------------------------------------------------
.../src/main/flex/itemRenderers/CustomListItemRenderer.mxml | 2 +-
examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b544583a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
index 5d4b55c..38d371d 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomListItemRenderer.mxml
@@ -38,7 +38,7 @@ limitations under the License.
<js:ItemRendererDataBinding />
</mdl:beads>
- <js:Span text="{data.label}">
+ <js:Span text="{product.label}">
<js:beads>
<mdl:ListItemPrimaryContent/>
</js:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b544583a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
index 567672c..7baa8cc 100644
--- a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package vos
{
+ [Bindable]
public class MenuItemVO
{
private var _label:String;
[36/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Footer initial components. Support mega and mini Footers in the same
component
Posted by bi...@apache.org.
Footer initial components. Support mega and mini Footers in the same component
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a115c718
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a115c718
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a115c718
Branch: refs/heads/feature/fontawesome
Commit: a115c718121e013d3a9a7d4be82a953fdd0659f2
Parents: 87d4a9d
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Jan 4 01:22:13 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Jan 4 01:22:13 2017 +0100
----------------------------------------------------------------------
.../src/main/flex/MainNavigation.mxml | 8 ++
.../src/main/flex/org/apache/flex/mdl/Footer.as | 106 ++++++++++++++++++
.../org/apache/flex/mdl/FooterLeftSection.as | 107 +++++++++++++++++++
.../org/apache/flex/mdl/FooterRightSection.as | 107 +++++++++++++++++++
.../src/main/resources/mdl-manifest.xml | 3 +
5 files changed, 331 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a115c718/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
index ee1a583..d32f555 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -119,4 +119,12 @@ limitations under the License.
</mdl:TabBarPanel>
</mdl:NavigationLayoutContent>
+
+ <mdl:Footer mini="true">
+ <mdl:FooterLeftSection>
+ </mdl:FooterLeftSection>
+
+ <mdl:FooterRightSection>
+ </mdl:FooterRightSection>
+ </mdl:Footer>
</mdl:NavigationLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a115c718/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as
new file mode 100644
index 0000000..43ec122
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as
@@ -0,0 +1,106 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl
+{
+ import org.apache.flex.core.ContainerBase;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The Footer class is a Container component capable of parenting other
+ * components
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class Footer extends ContainerBase
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function Footer()
+ {
+ super();
+
+ className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ typeNames = "mdl-mega-footer";
+
+ element = document.createElement('footer') as WrappedHTMLElement;
+
+ positioner = element;
+
+ // absolute positioned children need a non-null
+ // position value in the parent. It might
+ // get set to 'absolute' if the container is
+ // also absolutely positioned
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+
+ protected var _mini:Boolean = false;
+ /**
+ * A boolean flag to activate "mdl-mega-footer" or "mdl-mini-footer" effect selector.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get mini():Boolean
+ {
+ return _mini;
+ }
+ public function set mini(value:Boolean):void
+ {
+ _mini = value;
+
+ COMPILE::JS
+ {
+ element.classList.remove(typeNames);
+ if(!_mini)
+ {
+ typeNames = "mdl-mega-footer";
+ } else
+ {
+ typeNames = "mdl-mini-footer";
+ }
+ element.classList.add(typeNames);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a115c718/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as
new file mode 100644
index 0000000..0131020
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as
@@ -0,0 +1,107 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl
+{
+ import org.apache.flex.core.ContainerBase;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The FooterLeftSection class is a Container component capable of parenting other
+ * components
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class FooterLeftSection extends ContainerBase
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function FooterLeftSection()
+ {
+ super();
+
+ className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ typeNames = "mdl-mega-footer__left-section";
+
+ element = document.createElement('div') as WrappedHTMLElement;
+
+ positioner = element;
+
+ // absolute positioned children need a non-null
+ // position value in the parent. It might
+ // get set to 'absolute' if the container is
+ // also absolutely positioned
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+
+ /**
+ * Configuration depends on parent Footer.
+ * Check to see if is mega or mini.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+ if(parent is Footer)
+ {
+ element.classList.remove(typeNames);
+ if(!Footer(parent).mini)
+ {
+ typeNames = "mdl-mega-footer__left-section";
+ } else
+ {
+ typeNames = "mdl-mini-footer__left-section";
+ }
+ element.classList.add(typeNames);
+ }
+ else
+ {
+ throw new Error("FooterLeftSection can not be used if parent is not a MDL Footer component.");
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a115c718/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as
new file mode 100644
index 0000000..9902e9e
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as
@@ -0,0 +1,107 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.mdl
+{
+ import org.apache.flex.core.ContainerBase;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The FooterRightSection class is a Container component capable of parenting other
+ * components
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class FooterRightSection extends ContainerBase
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function FooterRightSection()
+ {
+ super();
+
+ className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ typeNames = "mdl-mega-footer__right-section";
+
+ element = document.createElement('div') as WrappedHTMLElement;
+
+ positioner = element;
+
+ // absolute positioned children need a non-null
+ // position value in the parent. It might
+ // get set to 'absolute' if the container is
+ // also absolutely positioned
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+
+ /**
+ * Configuration depends on parent Footer.
+ * Check to see if is mega or mini.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+ if(parent is Footer)
+ {
+ element.classList.remove(typeNames);
+ if(!Footer(parent).mini)
+ {
+ typeNames = "mdl-mega-footer__right-section";
+ } else
+ {
+ typeNames = "mdl-mini-footer__right-section";
+ }
+ element.classList.add(typeNames);
+ }
+ else
+ {
+ throw new Error("FooterRightSection can not be used if parent is not a MDL Footer component.");
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a115c718/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index 7bbbc32..a060fa1 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -85,6 +85,9 @@
<component id="Toast" class="org.apache.flex.mdl.Toast"/>
<component id="SnackbarModel" class="org.apache.flex.mdl.beads.models.SnackbarModel"/>
<component id="Snackbar" class="org.apache.flex.mdl.Snackbar"/>
+ <component id="Footer" class="org.apache.flex.mdl.Footer"/>
+ <component id="FooterLeftSection" class="org.apache.flex.mdl.FooterLeftSection"/>
+ <component id="FooterRightSection" class="org.apache.flex.mdl.FooterRightSection"/>
<component id="MaterialIconCancel" class="org.apache.flex.mdl.materialIcons.MaterialIconCancel"/>
<component id="MaterialIconAdd" class="org.apache.flex.mdl.materialIcons.MaterialIconAdd"/>
[29/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Remove redundant ItemRendererFactoryForArrayData - change it to
org.apache.flex.html.beads.DataItemRendererFactoryForArrayData
Posted by bi...@apache.org.
Remove redundant ItemRendererFactoryForArrayData - change it to org.apache.flex.html.beads.DataItemRendererFactoryForArrayData
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6642ca7d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6642ca7d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6642ca7d
Branch: refs/heads/feature/fontawesome
Commit: 6642ca7d4387fa1308a4ba5f834b03118e1c8efb
Parents: d6dec08
Author: piotrz <pi...@apache.org>
Authored: Tue Jan 3 13:45:51 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Tue Jan 3 13:45:51 2017 +0100
----------------------------------------------------------------------
.../ItemRendererFactoryForArrayData.as | 177 -------------------
.../src/main/resources/defaults.css | 4 +-
.../src/main/resources/mdl-manifest.xml | 1 -
3 files changed, 2 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6642ca7d/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as
deleted file mode 100644
index e96af4b..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/ItemRendererFactoryForArrayData.as
+++ /dev/null
@@ -1,177 +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.mdl.supportClasses
-{
- import org.apache.flex.core.IBead;
- import org.apache.flex.core.IDataProviderItemRendererMapper;
- import org.apache.flex.core.IItemRendererClassFactory;
- import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.IListPresentationModel;
- import org.apache.flex.core.ISelectableItemRenderer;
- import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.IStrand;
- import org.apache.flex.core.SimpleCSSStyles;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.core.ValuesManager;
- import org.apache.flex.events.Event;
- import org.apache.flex.events.EventDispatcher;
- import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.events.ItemRendererEvent;
- import org.apache.flex.html.beads.IListView;
-
- [Event(name="itemRendererCreated",type="org.apache.flex.events.ItemRendererEvent")]
-
- /**
- * The ItemRendererFactoryForArrayData class reads an
- * array of data and creates an item renderer for every
- * item in the array. Other implementations of
- * IDataProviderItemRendererMapper map different data
- * structures or manage a virtual set of renderers.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class ItemRendererFactoryForArrayData extends EventDispatcher implements IBead, IDataProviderItemRendererMapper
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ItemRendererFactoryForArrayData(target:Object=null)
- {
- super(target);
- }
-
- private var selectionModel:ISelectionModel;
-
- private var _strand:IStrand;
-
- /**
- * @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
- {
- _strand = value;
- IEventDispatcher(value).addEventListener("beadsAdded",finishSetup);
- IEventDispatcher(value).addEventListener("initComplete",finishSetup);
- }
-
- private function finishSetup(event:Event):void
- {
- selectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- var listView:IListView = _strand.getBeadByType(IListView) as IListView;
- dataGroup = listView.dataGroup;
- selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
-
- if (!itemRendererFactory)
- {
- _itemRendererFactory = new (ValuesManager.valuesImpl.getValue(_strand, "iItemRendererClassFactory")) as IItemRendererClassFactory;
- _strand.addBead(_itemRendererFactory);
- }
-
- dataProviderChangeHandler(null);
- }
-
- private var _itemRendererFactory:IItemRendererClassFactory;
-
- /**
- * The org.apache.flex.core.IItemRendererClassFactory used
- * to generate instances of item renderers.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get itemRendererFactory():IItemRendererClassFactory
- {
- return _itemRendererFactory;
- }
-
- /**
- * @private
- */
- public function set itemRendererFactory(value:IItemRendererClassFactory):void
- {
- _itemRendererFactory = value;
- }
-
- /**
- * The org.apache.flex.core.IItemRendererParent that will
- * parent the item renderers.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- protected var dataGroup:IItemRendererParent;
-
- protected function dataProviderChangeHandler(event:Event):void
- {
- var dp:Array = selectionModel.dataProvider as Array;
- if (!dp)
- return;
-
- dataGroup.removeAllElements();
-
- var listView:IListView = _strand.getBeadByType(IListView) as IListView;
- var presentationModel:IListPresentationModel = _strand.getBeadByType(IListPresentationModel) as IListPresentationModel;
-
- // This needs to be re-thought. There should be a better way to move the
- // properties from the component to the renderers. At least a new interface
- // should be created.
- var component:UIBase = _strand as UIBase;
-
- var n:int = dp.length;
- for (var i:int = 0; i < n; i++)
- {
- var ir:ISelectableItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ISelectableItemRenderer;
- dataGroup.addElement(ir);
- ir.index = i;
- ir.labelField = component["labelField"];
- if (presentationModel) {
- var style:SimpleCSSStyles = new SimpleCSSStyles();
- style.marginBottom = presentationModel.separatorThickness;
- UIBase(ir).style = style;
- UIBase(ir).height = presentationModel.rowHeight;
- UIBase(ir).percentWidth = 100;
- }
- ir.data = dp[i];
-
- var newEvent:ItemRendererEvent = new ItemRendererEvent(ItemRendererEvent.CREATED);
- newEvent.itemRenderer = ir;
- dispatchEvent(newEvent);
- }
-
- IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6642ca7d/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index b8a13b0..1cf6a46 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -51,7 +51,7 @@ List
IBeadView: ClassReference("org.apache.flex.mdl.beads.views.ListView");
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
IBeadLayout: ClassReference(null); /*"org.apache.flex.html.beads.layouts.VerticalLayout"*/
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.mdl.supportClasses.ItemRendererFactoryForArrayData");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.ListItemRenderer");
}
@@ -61,7 +61,7 @@ Menu
IBeadView: ClassReference("org.apache.flex.mdl.beads.views.ListView");
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
IBeadLayout: ClassReference(null); /*"org.apache.flex.html.beads.layouts.VerticalLayout"*/
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.mdl.supportClasses.ItemRendererFactoryForArrayData");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.MenuItemRenderer");
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6642ca7d/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index b3d00cf..7bbbc32 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -55,7 +55,6 @@
<component id="ListItemSubTitle" class="org.apache.flex.mdl.beads.ListItemSubTitle"/>
<component id="ListItemSecondaryInfo" class="org.apache.flex.mdl.beads.ListItemSecondaryInfo"/>
<component id="ListItemTextBody" class="org.apache.flex.mdl.beads.ListItemTextBody"/>
- <component id="ItemRendererFactoryForArrayData" class="org.apache.flex.mdl.supportClasses.ItemRendererFactoryForArrayData"/>
<component id="NavigationLayout" class="org.apache.flex.mdl.NavigationLayout"/>
<component id="LayoutTitle" class="org.apache.flex.mdl.LayoutTitle"/>
<component id="Navigation" class="org.apache.flex.mdl.Navigation"/>
[35/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Initial set of classes for Express project.
Posted by bi...@apache.org.
Initial set of classes for Express 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/87d4a9d6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87d4a9d6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87d4a9d6
Branch: refs/heads/feature/fontawesome
Commit: 87d4a9d6d069f1c57be1f039b3bd20397767179e
Parents: b1f2493
Author: Peter Ent <pe...@apache.org>
Authored: Tue Jan 3 15:23:32 2017 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Tue Jan 3 15:23:32 2017 -0500
----------------------------------------------------------------------
.../js/FlexJS/projects/ExpressJS/build.xml | 142 +++++++++++++++++++
.../src/main/config/compile-js-config.xml | 92 ++++++++++++
frameworks/projects/Express/build.xml | 116 +++++++++++++++
frameworks/projects/Express/pom.xml | 128 +++++++++++++++++
.../src/main/config/compile-as-config.xml | 82 +++++++++++
.../Express/src/main/flex/ExpressClasses.as | 42 ++++++
.../flex/org/apache/flex/express/Application.as | 37 +++++
.../flex/org/apache/flex/express/Container.as | 40 ++++++
.../flex/org/apache/flex/express/HContainer.as | 36 +++++
.../main/flex/org/apache/flex/express/HView.as | 36 +++++
.../org/apache/flex/express/MXMLItemRenderer.as | 37 +++++
.../flex/org/apache/flex/express/VContainer.as | 36 +++++
.../main/flex/org/apache/flex/express/VView.as | 36 +++++
.../main/flex/org/apache/flex/express/View.as | 37 +++++
.../Express/src/main/resources/defaults.css | 58 ++++++++
.../src/main/resources/express-manifest.xml | 33 +++++
16 files changed, 988 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/js/FlexJS/projects/ExpressJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ExpressJS/build.xml b/frameworks/js/FlexJS/projects/ExpressJS/build.xml
new file mode 100644
index 0000000..49ce823
--- /dev/null
+++ b/frameworks/js/FlexJS/projects/ExpressJS/build.xml
@@ -0,0 +1,142 @@
+<?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="ExpressJS" default="main" basedir=".">
+ <property name="FLEXJS_HOME" location="../../../../.."/>
+
+ <property file="${FLEXJS_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FLEXJS_HOME}/build.properties"/>
+ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+
+ <property name="target.name" value="${ant.project.name}.swc" />
+ <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+ <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+ <property file="${basedir}/${target.name}.properties"/>
+ <delete file="${basedir}/${target.name}.properties"/>
+
+ <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
+ </target>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+ <include name="${target.name}"/>
+ </fileset>
+ </delete>
+ <delete failonerror="false" includeemptydirs="true">
+ <fileset dir="${basedir}/target">
+ <include name="**/**"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <target name="compile-asjs" depends="check-compiler">
+ <echo message="Cross-compiling ${target.name}"/>
+ <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
+ <jvmarg value="-Xmx384m" />
+ <jvmarg value="-Dsun.io.useCanonCaches=false" />
+ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
+ <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+ <arg value="+flexlib=${FLEX_HOME}/frameworks" />
+ <arg value="-js-output-type=FLEXJS" />
+ <arg value="-compiler.strict-xml=true" />
+ <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
+ <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
+ <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
+ <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
+ </java>
+ </target>
+
+ <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects">
+ <echo message="Compiling target/${target.name}"/>
+ <echo message="FLEX_HOME: ${FLEX_HOME}"/>
+ <echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/>
+ <mkdir dir="${basedir}/target"/>
+
+ <compc fork="true"
+ output="${basedir}/target/${target.name}">
+ <jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" />
+ <load-config filename="src/main/config/compile-js-config.xml" />
+ <arg value="-compiler.strict-xml=true" />
+ </compc>
+ <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
+ </target>
+
+ <target name="copy-js" >
+ <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/>
+ <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources">
+ <fileset dir="${basedir}/target/generated-sources/flexjs">
+ <include name="**/**" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="check-compiler" depends="check-falcon-home, check-falconjx-home">
+ <path id="lib.path">
+ <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ </path>
+ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
+ </target>
+
+ <target name="check-falcon-home" unless="FALCON_HOME"
+ description="Check FALCON_HOME is a directory.">
+
+ <echo message="FALCON_HOME is ${env.FALCON_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/lib/falcon-mxmlc.jar"
+ type="file"
+ property="FALCON_HOME"
+ value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+
+ <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+ unless="FALCON_HOME"/>
+ </target>
+
+ <target name="check-falconjx-home" unless="FALCONJX_HOME"
+ description="Check FALCON_HOME is a directory.">
+
+ <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
+
+ <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"/>
+
+ <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
+ unless="FALCONJX_HOME"/>
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
new file mode 100644
index 0000000..26db1d9
--- /dev/null
+++ b/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml
@@ -0,0 +1,92 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>false</accessible>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+
+ <define>
+ <name>COMPILE::SWF</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>COMPILE::JS</name>
+ <value>true</value>
+ </define>
+
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <!-- overwrite the default library-path setting -->
+ <library-path>
+ <path-element>../../../../../../../../js/libs/GCL.swc</path-element>
+ <!-- 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/BindingJS.swc</path-element>
+ <path-element>../../../../../libs/CoreJS.swc</path-element>
+ <path-element>../../../../../libs/GraphicsJS.swc</path-element>
+ <path-element>../../../../../libs/CollectionsJS.swc</path-element>
+ <path-element>../../../../../libs/HTMLJS.swc</path-element>
+ </library-path>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/express</uri>
+ <manifest>../../../../../../../projects/Express/src/main/resources/express-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>../../../../../../../projects/Express/src/main/flex</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-file>
+ </include-file>
+
+ <include-sources>
+ </include-sources>
+
+ <include-classes>
+ <class>ExpressClasses</class>
+ </include-classes>
+
+ <include-namespaces>
+ <uri>library://ns.apache.org/flexjs/express</uri>
+ </include-namespaces>
+
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/build.xml b/frameworks/projects/Express/build.xml
new file mode 100644
index 0000000..7c1a4d1
--- /dev/null
+++ b/frameworks/projects/Express/build.xml
@@ -0,0 +1,116 @@
+<?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="Express" default="main" basedir=".">
+ <property name="FLEXJS_HOME" location="../../.."/>
+
+ <property file="${FLEXJS_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FLEXJS_HOME}/build.properties"/>
+ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+
+ <property name="target.name" value="${ant.project.name}.swc" />
+
+ <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
+ </target>
+
+ <target name="compile-js">
+ <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
+ </target>
+
+ <target name="copy-swc">
+ <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+ </target>
+
+ <target name="check-for-tests" >
+ <condition property="skip-tests" >
+ <not>
+ <available file="${basedir}/src/test/flex/build.xml" />
+ </not>
+ </condition>
+ </target>
+
+ <target name="test" depends="check-for-tests" unless="skip-tests">
+ <ant dir="src/test/flex" />
+ </target>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset dir="${FLEXJS_HOME}/frameworks/libs">
+ <include name="${target.name}"/>
+ </fileset>
+ </delete>
+ <delete failonerror="false" includeemptydirs="true">
+ <fileset dir="${basedir}/target">
+ <include name="**/**"/>
+ </fileset>
+ </delete>
+ <antcall target="clean-tests" />
+ </target>
+
+ <target name="clean-tests" depends="check-for-tests" unless="skip-tests">
+ <ant dir="src/test/flex" target="clean"/>
+ </target>
+
+ <target name="compile" description="Compiles .as files into .swc">
+ <echo message="Compiling libs/${ant.project.name}.swc"/>
+ <echo message="FLEX_HOME: ${FLEX_HOME}"/>
+ <echo message="FALCON_HOME: ${FALCON_HOME}"/>
+
+ <compc fork="true"
+ output="${basedir}/target/${target.name}">
+ <jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+ <arg value="-define=COMPILE::SWF,true" />
+ <arg value="-define=COMPILE::JS,false" />
+ </compc>
+ <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+ </target>
+
+ <target name="check-compiler" depends="check-falcon-home">
+ <path id="lib.path">
+ <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ </path>
+ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
+ </target>
+
+ <target name="check-falcon-home" unless="FALCON_HOME"
+ description="Check FALCON_HOME is a directory.">
+
+ <echo message="FALCON_HOME is ${env.FALCON_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/lib/falcon-mxmlc.jar"
+ type="file"
+ property="FALCON_HOME"
+ value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+
+ <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+ unless="FALCON_HOME"/>
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/pom.xml b/frameworks/projects/Express/pom.xml
new file mode 100644
index 0000000..5e54ee5
--- /dev/null
+++ b/frameworks/projects/Express/pom.xml
@@ -0,0 +1,128 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>projects</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>Express</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <packaging>swc</packaging>
+
+ <name>Apache Flex - FlexJS: Framework: Libs: Express</name>
+
+ <build>
+ <sourceDirectory>src/main/flex</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>flexjs-maven-plugin</artifactId>
+ <version>${flexjs.compiler.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <type>as</type>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>${project.basedir}/src/main/resources/basic-as-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/svg</uri>
+ <manifest>${project.basedir}/src/main/resources/svg-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+ <includeClasses>
+ <includeClass>ExpressClasses</includeClass>
+ </includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ </includeFiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <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>Core</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/config/compile-as-config.xml b/frameworks/projects/Express/src/main/config/compile-as-config.xml
new file mode 100644
index 0000000..c71cefd
--- /dev/null
+++ b/frameworks/projects/Express/src/main/config/compile-as-config.xml
@@ -0,0 +1,82 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>false</accessible>
+
+ <external-library-path>
+ <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+ <path-element>../../../../../libs/Binding.swc</path-element>
+ <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../../../libs/Graphics.swc</path-element>
+ <path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/HTML.swc</path-element>
+ </external-library-path>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/express</uri>
+ <manifest>../resources/express-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>../flex</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-file>
+ <name>defaults.css</name>
+ <path>../resources/defaults.css</path>
+ </include-file>
+
+ <include-classes>
+ <class>ExpressClasses</class>
+ </include-classes>
+
+ <include-namespaces>
+ <uri>library://ns.apache.org/flexjs/express</uri>
+ </include-namespaces>
+
+ <target-player>${playerglobal.version}</target-player>
+
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/ExpressClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/ExpressClasses.as b/frameworks/projects/Express/src/main/flex/ExpressClasses.as
new file mode 100644
index 0000000..b2a813d
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/ExpressClasses.as
@@ -0,0 +1,42 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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
+{
+
+/**
+ * @private
+ * This class is used to link additional classes into rpc.swc
+ * beyond those that are found by dependecy analysis starting
+ * from the classes specified in manifest.xml.
+ */
+internal class ExpressClasses
+{
+
+ import org.apache.flex.express.Application; Application;
+ import org.apache.flex.express.Container; Container;
+ import org.apache.flex.express.HContainer; HContainer;
+ import org.apache.flex.express.HView; HView;
+ import org.apache.flex.express.MXMLItemRenderer; MXMLItemRenderer;
+ import org.apache.flex.express.VContainer; VContainer;
+ import org.apache.flex.express.View; View;
+ import org.apache.flex.express.VView; VView;
+}
+
+}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as
new file mode 100644
index 0000000..1199dd5
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as
@@ -0,0 +1,37 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.core.Application;
+ import org.apache.flex.core.SimpleCSSValuesImpl;
+
+ /**
+ * This class extends the standard Application and sets up the
+ * SimpleCSSValuesImpl (implementation) for convenience.
+ */
+ public class Application extends org.apache.flex.core.Application
+ {
+ public function Application()
+ {
+ super();
+
+ this.valuesImpl = new SimpleCSSValuesImpl();
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
new file mode 100644
index 0000000..0ebd54a
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
@@ -0,0 +1,40 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.binding.ContainerDataBinding;
+ import org.apache.flex.html.Container;
+ import org.apache.flex.html.supportClasses.ScrollingViewport;
+
+ /**
+ * This class extends the standard Container and adds the
+ * ContainerDataBinding bead and ScrollingViewport beads for
+ * convenience.
+ */
+ public class Container extends org.apache.flex.html.Container
+ {
+ public function Container()
+ {
+ super();
+
+ addBead(new ContainerDataBinding());
+ addBead(new ScrollingViewport());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HContainer.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HContainer.as
new file mode 100644
index 0000000..8ad90a0
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HContainer.as
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.html.beads.layouts.HorizontalLayout;
+
+ /**
+ * This class extends Container and adds the HorizontalLayout
+ * bead for convenience.
+ */
+ public class HContainer extends Container
+ {
+ public function HContainer()
+ {
+ super();
+
+ addBead(new HorizontalLayout());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HView.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HView.as
new file mode 100644
index 0000000..5ad3156
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/HView.as
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.html.beads.layouts.HorizontalLayout;
+
+ /**
+ * This class extends View and adds the HorizontalLayout bead
+ * for convenience.
+ */
+ public class HView extends View
+ {
+ public function HView()
+ {
+ super();
+
+ addBead(new HorizontalLayout());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/MXMLItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/MXMLItemRenderer.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/MXMLItemRenderer.as
new file mode 100644
index 0000000..d4174c3
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/MXMLItemRenderer.as
@@ -0,0 +1,37 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.binding.ItemRendererDataBinding;
+ import org.apache.flex.html.supportClasses.MXMLItemRenderer;
+
+ /**
+ * This class extends MXMLItemRenderer and adds ItemRendererDataBinding
+ * for convenience.
+ */
+ public class MXMLItemRenderer extends org.apache.flex.html.supportClasses.MXMLItemRenderer
+ {
+ public function MXMLItemRenderer()
+ {
+ super();
+
+ addBead(new ItemRendererDataBinding());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VContainer.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VContainer.as
new file mode 100644
index 0000000..a133b8c
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VContainer.as
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.html.beads.layouts.VerticalLayout;
+
+ /**
+ * This class extends Container and adds the VerticalLayout bead
+ * for convenience.
+ */
+ public class VContainer extends Container
+ {
+ public function VContainer()
+ {
+ super();
+
+ addBead(new VerticalLayout());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VView.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VView.as
new file mode 100644
index 0000000..b0784fd
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/VView.as
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.html.beads.layouts.VerticalLayout;
+
+ /**
+ * This class extends View and adds the VerticalLayout bead for
+ * convenience.
+ */
+ public class VView extends View
+ {
+ public function VView()
+ {
+ super();
+
+ addBead(new VerticalLayout());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/View.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/View.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/View.as
new file mode 100644
index 0000000..3a8001f
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/View.as
@@ -0,0 +1,37 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.express
+{
+ import org.apache.flex.binding.ViewDataBinding;
+ import org.apache.flex.core.View;
+
+ /**
+ * This View extends the standard View and adds the ViewDataBinding bead
+ * for convenience.
+ */
+ public class View extends org.apache.flex.core.View
+ {
+ public function View()
+ {
+ super();
+
+ addBead(new ViewDataBinding());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/resources/defaults.css b/frameworks/projects/Express/src/main/resources/defaults.css
new file mode 100644
index 0000000..7e1f593
--- /dev/null
+++ b/frameworks/projects/Express/src/main/resources/defaults.css
@@ -0,0 +1,58 @@
+/*
+*
+* 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.
+*
+*/
+
+@namespace "library://ns.apache.org/flexjs/express";
+
+/* Global style declaration */
+*
+{
+ font-family: "Arial";
+ font-size: 12px;
+ border-width: 1px;
+}
+
+.flexjs *, . flexjs *:before, . flexjs *:after {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+Application
+{
+ padding: 0px;
+ margin: 0px;
+}
+
+Container
+{
+ IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
+ IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea");
+ IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
+}
+
+View
+{
+ IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
+ IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea");
+ IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport");
+ IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
+}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87d4a9d6/frameworks/projects/Express/src/main/resources/express-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/resources/express-manifest.xml b/frameworks/projects/Express/src/main/resources/express-manifest.xml
new file mode 100644
index 0000000..9559985
--- /dev/null
+++ b/frameworks/projects/Express/src/main/resources/express-manifest.xml
@@ -0,0 +1,33 @@
+<?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.
+
+-->
+
+
+<componentPackage>
+
+ <component id="Application" class="org.apache.flex.express.Application"/>
+ <component id="Container" class="org.apache.flex.express.Container"/>
+ <component id="HContainer" class="org.apache.flex.express.HContainer"/>
+ <component id="HView" class="org.apache.flex.express.HView"/>
+ <component id="MXMLItemRenderer" class="org.apache.flex.express.MXMLItemRenderer"/>
+ <component id="VContainer" class="org.apache.flex.express.VContainer"/>
+ <component id="View" class="org.apache.flex.express.View"/>
+ <component id="VView" class="org.apache.flex.express.VView"/>
+
+</componentPackage>
[20/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Make one of the element disabled in menu and add divider
Posted by bi...@apache.org.
Make one of the element disabled in menu and add divider
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e5f88f42
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e5f88f42
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e5f88f42
Branch: refs/heads/feature/fontawesome
Commit: e5f88f42ad041c8366ef9be338a02cc864aab739
Parents: 9888a41
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 2 08:45:09 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 2 08:45:09 2017 +0100
----------------------------------------------------------------------
.../flex/itemRenderers/CustomMenuItemRenderer.mxml | 7 ++++---
.../MDLExample/src/main/flex/models/MenuModel.as | 4 ++--
.../flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as | 14 +++++++++++++-
3 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e5f88f42/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
index 3eb4636..ccbd7c7 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
@@ -18,10 +18,11 @@ limitations under the License.
-->
<mdl:MenuItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:mdl="library://ns.apache.org/flexjs/mdl">
- <!--<mdl:beads>
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl"
+ divider="{menuItem.hasDivider}">
+ <mdl:beads>
<mdl:Disabled disabled="{menuItem.disabled}"/>
- </mdl:beads> -->
+ </mdl:beads>
<fx:Script><![CDATA[
import vos.MenuItemVO;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e5f88f42/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
index a68f8b9..a883130 100644
--- a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
+++ b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
@@ -27,8 +27,8 @@ package models
{
private var _menuItems:Array = [
new MenuItemVO("Some Action"),
- new MenuItemVO("Another Action"),
- new MenuItemVO("More Action", false)
+ new MenuItemVO("Another Action", true),
+ new MenuItemVO("More Action", false, false)
];
public function get menuItems():Array
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e5f88f42/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
index 414fe10..567672c 100644
--- a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -22,10 +22,12 @@ package vos
{
private var _label:String;
private var _disabled:Boolean;
+ private var _hasDivider:Boolean;
- public function MenuItemVO(label:String, disabled:Boolean = false)
+ public function MenuItemVO(label:String, hasDivider:Boolean = false, disabled:Boolean = false)
{
this.label = label;
+ this.hasDivider = hasDivider;
this.disabled = disabled;
}
@@ -48,5 +50,15 @@ package vos
{
_disabled = value;
}
+
+ public function get hasDivider():Boolean
+ {
+ return _hasDivider;
+ }
+
+ public function set hasDivider(value:Boolean):void
+ {
+ _hasDivider = value;
+ }
}
}
[09/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - -
Clean up unused imports - Rename TBody to THead - Change className assignment
to classList.toggle
Posted by bi...@apache.org.
- Clean up unused imports
- Rename TBody to THead
- Change className assignment to classList.toggle
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c103c098
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c103c098
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c103c098
Branch: refs/heads/feature/fontawesome
Commit: c103c098e18d13d59cc9ea52779a1563552bc48b
Parents: 8e1c82f
Author: piotrz <pi...@apache.org>
Authored: Thu Dec 29 20:04:00 2016 +0100
Committer: piotrz <pi...@apache.org>
Committed: Thu Dec 29 20:04:00 2016 +0100
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/Slider.as | 1 -
.../src/main/flex/org/apache/flex/mdl/TBody.as | 98 --------------------
.../src/main/flex/org/apache/flex/mdl/THead.as | 3 +-
.../flex/org/apache/flex/mdl/TabBarButton.as | 7 +-
.../src/main/flex/org/apache/flex/mdl/Table.as | 2 +-
.../main/flex/org/apache/flex/mdl/TextField.as | 1 -
.../org/apache/flex/mdl/beads/ContactChip.as | 5 -
.../apache/flex/mdl/beads/ContactImageChip.as | 1 -
.../flex/mdl/beads/ListItemPrimaryContent.as | 5 -
.../flex/mdl/beads/ListItemSecondaryAction.as | 5 -
.../flex/mdl/beads/ListItemSecondaryContent.as | 5 -
.../flex/mdl/beads/ListItemSecondaryInfo.as | 5 -
.../apache/flex/mdl/beads/ListItemSubTitle.as | 5 -
.../apache/flex/mdl/beads/ListItemTextBody.as | 5 -
.../apache/flex/mdl/beads/SliderTrackView.as | 1 -
.../flex/org/apache/flex/mdl/beads/Tooltip.as | 6 --
.../beads/controllers/SliderMouseController.as | 5 +-
.../org/apache/flex/mdl/beads/views/ListView.as | 1 -
.../apache/flex/mdl/beads/views/SliderView.as | 5 -
19 files changed, 6 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
index d2fb38e..b74a229 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
@@ -24,7 +24,6 @@ package org.apache.flex.mdl
COMPILE::JS
{
- import org.apache.flex.html.beads.controllers.SliderMouseController;
import org.apache.flex.core.WrappedHTMLElement;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as
deleted file mode 100644
index cfc6928..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as
+++ /dev/null
@@ -1,98 +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.mdl
-{
- import org.apache.flex.core.ContainerBase;
-
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
- /**
- * The THead class is a Container component capable of parenting
- * TH Table Header Cells
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class THead extends ContainerBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function THead()
- {
- super();
-
- className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
- }
-
- /**
- * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- */
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- typeNames = "";
-
- element = document.createElement('thead') as WrappedHTMLElement;
- element.className = typeNames;
-
- positioner = element;
-
- // absolute positioned children need a non-null
- // position value in the parent. It might
- // get set to 'absolute' if the container is
- // also absolutely positioned
- element.flexjs_wrapper = this;
-
- return element;
- }
-
- protected var _ascending:Boolean;
- /**
- * A boolean flag to activate "mdl-data-table__header--sorted-ascending" effect selector.
- * Applies all/individual selectable behavior (checkboxes)
- * Optional; goes on table element
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get ascending():Boolean
- {
- return _ascending;
- }
- public function set selectable(value:Boolean):void
- {
- _ascending = value;
-
- className += (_ascending ? " mdl-data-table__header--sorted-ascending" : "mdl-data-table__header--sorted-descending");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as
index cfc6928..9b6e92a 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as
@@ -92,7 +92,8 @@ package org.apache.flex.mdl
{
_ascending = value;
- className += (_ascending ? " mdl-data-table__header--sorted-ascending" : "mdl-data-table__header--sorted-descending");
+ element.classList.toggle("mdl-data-table__header--sorted-ascending", _ascending);
+ element.classList.toggle("mdl-data-table__header--sorted-descending", _ascending == false);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarButton.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarButton.as
index 0d183c1..07d4682 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarButton.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarButton.as
@@ -82,11 +82,8 @@ package org.apache.flex.mdl
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
- var a:HTMLElement = document.createElement('a') as HTMLElement;
- a.setAttribute('href', href);
-
- textNode = document.createTextNode('') as Text;
- a.appendChild(textNode);
+ var a:HTMLAnchorElement = document.createElement('a') as HTMLAnchorElement;
+ a.href = href;
element = a as WrappedHTMLElement;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as
index 55e8865..0ac0377 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as
@@ -123,7 +123,7 @@ package org.apache.flex.mdl
{
_selectable = value;
- className += (_selectable ? " mdl-data-table--selectable" : "");
+ element.classList.toggle("mdl-data-table--selectable", _selectable);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
index 810f5b0..e84f058 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TextField.as
@@ -17,7 +17,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
- import org.apache.flex.core.ITextModel;
import org.apache.flex.events.Event;
import org.apache.flex.html.TextInput;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as
index 289b959..84aa001 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactChip.as
@@ -21,15 +21,11 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.IStrand;
import org.apache.flex.html.Span;
- import org.apache.flex.mdl.supportClasses.IMdlColor;
- import org.apache.flex.mdl.supportClasses.IMdlTextColor;
import org.apache.flex.utils.StrandUtils;
COMPILE::JS
{
- import org.apache.flex.core.UIHTMLElementWrapper;
import org.apache.flex.core.UIBase;
- import org.apache.flex.core.WrappedHTMLElement;
}
/**
* The ContactChip bead class is a specialty bead that can be used to add additional
@@ -84,7 +80,6 @@ package org.apache.flex.mdl.beads
* @flexjsignorecoercion HTMLSpanElement
* @flexjsignorecoercion Text
* @flexjsignorecoercion HTMLButtonElement
- * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
*
* @param value
*/
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as
index 0225e5a..49ae1ec 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ContactImageChip.as
@@ -21,7 +21,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.UIBase;
- import org.apache.flex.html.Image;
/**
* The ContactImageChip bead class is a specialty bead that can be used to add additional
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemPrimaryContent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemPrimaryContent.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemPrimaryContent.as
index de0948b..8a30530 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemPrimaryContent.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemPrimaryContent.as
@@ -22,11 +22,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.UIBase;
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
/**
* The ListItemPrimaryContent class decorates a tag element in a list item renderer
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryAction.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryAction.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryAction.as
index 2f64127..e920638 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryAction.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryAction.as
@@ -22,11 +22,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.UIBase;
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
/**
* The ListItemSecondaryAction class decorates a tag element in a list item renderer
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryContent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryContent.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryContent.as
index b3691a3..635c4b1 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryContent.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryContent.as
@@ -22,11 +22,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.UIBase;
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
/**
* The ListItemSecondaryContent class decorates a tag element in a list item renderer
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryInfo.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryInfo.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryInfo.as
index 82cd173..90ef1a0 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryInfo.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSecondaryInfo.as
@@ -22,11 +22,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.UIBase;
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
/**
* The ListItemSecondaryInfo class decorates a tag element in a list item renderer
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSubTitle.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSubTitle.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSubTitle.as
index 392a651..4b405cf 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSubTitle.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemSubTitle.as
@@ -22,11 +22,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.UIBase;
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
/**
* The ListItemSubTitle class decorates a tag element in a list item renderer
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemTextBody.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemTextBody.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemTextBody.as
index 4105674..8316c39 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemTextBody.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ListItemTextBody.as
@@ -22,11 +22,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.UIBase;
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
-
/**
* The ListItemTextBody class decorates a tag element in a list item renderer
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
index dc63e1d..e22bedc 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/SliderTrackView.as
@@ -25,7 +25,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.UIBase;
import org.apache.flex.html.Button;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Tooltip.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Tooltip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Tooltip.as
index 4c9084f..9efb1ca 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Tooltip.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/Tooltip.as
@@ -21,12 +21,6 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.IBead;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.UIBase;
- import org.apache.flex.html.Div;
-
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- }
/**
* The Tooltip class represents
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
index 4afb6d8..876334c 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
@@ -28,15 +28,12 @@ package org.apache.flex.mdl.beads.controllers
import org.apache.flex.events.MouseEvent;
import org.apache.flex.geom.Point;
import org.apache.flex.html.beads.ISliderView;
- import org.apache.flex.mdl.beads.SliderTrackView;
COMPILE::JS
{
- import goog.events;
- import goog.events.EventType;
+ import goog.events;
import org.apache.flex.events.BrowserEvent;
import org.apache.flex.mdl.Slider;
- import org.apache.flex.mdl.beads.SliderThumbView;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/ListView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/ListView.as
index b620b83..b642c18 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/ListView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/ListView.as
@@ -22,7 +22,6 @@ package org.apache.flex.mdl.beads.views
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;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c103c098/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
index cbd5ade..175c949 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
@@ -18,11 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.beads.views
{
- COMPILE::SWF {
- import flash.display.DisplayObject;
- import flash.display.Sprite;
- }
-
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadModel;
[34/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Posted by bi...@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/b1f2493e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b1f2493e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b1f2493e
Branch: refs/heads/feature/fontawesome
Commit: b1f2493e30cb0e37b159ce3ed422da929e1d0613
Parents: 632b493 354c8dc
Author: Carlos Rovira <ca...@apache.org>
Authored: Tue Jan 3 19:39:23 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Tue Jan 3 19:39:23 2017 +0100
----------------------------------------------------------------------
examples/flexjs/MDLExample/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[21/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Use CustomMenuItemRenderer in example
Posted by bi...@apache.org.
Use CustomMenuItemRenderer in example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1ac69510
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1ac69510
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1ac69510
Branch: refs/heads/feature/fontawesome
Commit: 1ac6951035ce67524a5b19dcb5cba9a00dae159e
Parents: e5f88f4
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 2 08:50:37 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 2 08:50:37 2017 +0100
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml | 4 ++--
examples/flexjs/MDLExample/src/main/resources/mdl-styles.css | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ac69510/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
index e9f668d..5527d73 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -64,7 +64,7 @@ limitations under the License.
<mdl:NavigationLink text="Styles" href="https://getmdl.io/styles/index.html"/>
<mdl:NavigationLink text="Customize" href="https://getmdl.io/customize/index.html"/>
<mdl:NavigationLink text="Showcase" href="https://getmdl.io/showcase/index.html"/>
- <mdl:NavigationLink text="FAQ" href="https://getmdl.io/faq/index.html"/>
+ <mdl:NavigationLink text="FAQ" href="https://getmdl.io/faq/index.html"/>
</mdl:Navigation>
</mdl:Drawer>
@@ -125,7 +125,7 @@ limitations under the License.
</mdl:Button>
<mdl:Menu dataMdlFor="menu_btn" ripple="true" bottom="true" left="false"
- labelField="label">
+ labelField="label" className="customMenuItemRenderer">
<mdl:beads>
<js:ConstantBinding
sourceID="menuModel"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ac69510/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
index 483146b..6dd7267 100644
--- a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
+++ b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css
@@ -73,7 +73,7 @@ js|Image
IItemRenderer: ClassReference("itemRenderers.AvatarAndActionThreeLineListItemRenderer");
}
-.menuItemRenderer
+.customMenuItemRenderer
{
IItemRenderer: ClassReference("itemRenderers.CustomMenuItemRenderer");
}
[26/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
Add ItemRendererDataBinding to CustomMenuItemRenderer - make getter menuItem
working, but binding is still not fixed.
Posted by bi...@apache.org.
Add ItemRendererDataBinding to CustomMenuItemRenderer - make getter menuItem working, but binding is still not fixed.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/54cc4d54
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/54cc4d54
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/54cc4d54
Branch: refs/heads/feature/fontawesome
Commit: 54cc4d54a38e70dfc5fddf019d3709217837ed9f
Parents: de87ded
Author: piotrz <pi...@apache.org>
Authored: Tue Jan 3 08:35:15 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Tue Jan 3 08:35:15 2017 +0100
----------------------------------------------------------------------
.../main/flex/itemRenderers/CustomMenuItemRenderer.mxml | 5 +++--
.../flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as | 12 ++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54cc4d54/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
index ccbd7c7..90e3dc2 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
@@ -19,18 +19,19 @@ limitations under the License.
-->
<mdl:MenuItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
+ xmlns:binding="org.apache.flex.binding.*"
divider="{menuItem.hasDivider}">
<mdl:beads>
+ <binding:ItemRendererDataBinding />
<mdl:Disabled disabled="{menuItem.disabled}"/>
</mdl:beads>
<fx:Script><![CDATA[
import vos.MenuItemVO;
- [Bindable("dataChange")]
+ [Bindable("__NoChangeEvent__")]
public function get menuItem():MenuItemVO
{
return data as MenuItemVO;
}
-
]]></fx:Script>
</mdl:MenuItemRenderer>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54cc4d54/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
index 7baa8cc..ce8226c 100644
--- a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -21,18 +21,18 @@ package vos
[Bindable]
public class MenuItemVO
{
- private var _label:String;
- private var _disabled:Boolean;
- private var _hasDivider:Boolean;
+ public var label:String;
+ public var disabled:Boolean;
+ public var hasDivider:Boolean;
- public function MenuItemVO(label:String, hasDivider:Boolean = false, disabled:Boolean = false)
+ public function MenuItemVO(label:String, hasDivider:Boolean = false, disabled:Boolean = true)
{
this.label = label;
this.hasDivider = hasDivider;
this.disabled = disabled;
}
- public function get label():String
+ /* public function get label():String
{
return _label;
}
@@ -60,6 +60,6 @@ package vos
public function set hasDivider(value:Boolean):void
{
_hasDivider = value;
- }
+ } */
}
}
[04/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
MDL Slider event change working
Posted by bi...@apache.org.
MDL Slider event change working
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/23e83204
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/23e83204
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/23e83204
Branch: refs/heads/feature/fontawesome
Commit: 23e83204ebc2a5c075a52387992be61e07c6cffd
Parents: d0a69eb
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Dec 28 18:40:22 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Dec 28 18:40:22 2016 +0100
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/Slider.as | 35 +-----
.../beads/controllers/SliderMouseController.as | 112 ++++++++---------
.../apache/flex/mdl/beads/views/SliderView.as | 122 +++++++------------
3 files changed, 104 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23e83204/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
index bcbef9b..d2fb38e 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as
@@ -25,7 +25,7 @@ package org.apache.flex.mdl
COMPILE::JS
{
import org.apache.flex.html.beads.controllers.SliderMouseController;
- import org.apache.flex.core.WrappedHTMLElement;
+ import org.apache.flex.core.WrappedHTMLElement;
}
[Event(name="valueChange", type="org.apache.flex.events.Event")]
@@ -60,6 +60,7 @@ package org.apache.flex.mdl
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ //default model values
IRangeModel(model).value = 0;
IRangeModel(model).minimum = 0;
IRangeModel(model).maximum = 100;
@@ -82,11 +83,6 @@ package org.apache.flex.mdl
public function set value(newValue:Number):void
{
IRangeModel(model).value = newValue;
-
- /*COMPILE::JS
- {
- (element as HTMLInputElement).value = IRangeModel(model).value.toString();
- }*/
}
/**
@@ -104,11 +100,6 @@ package org.apache.flex.mdl
public function set minimum(value:Number):void
{
IRangeModel(model).minimum = value;
-
- /*COMPILE::JS
- {
- (element as HTMLInputElement).min = IRangeModel(model).minimum.toString();
- }*/
}
/**
@@ -126,11 +117,6 @@ package org.apache.flex.mdl
public function set maximum(value:Number):void
{
IRangeModel(model).maximum = value;
-
- /*COMPILE::JS
- {
- (element as HTMLInputElement).max = IRangeModel(model).maximum.toString();
- }*/
}
/**
@@ -167,11 +153,6 @@ package org.apache.flex.mdl
public function set stepSize(value:Number):void
{
IRangeModel(model).stepSize = value;
-
- /*COMPILE::JS
- {
- (element as HTMLInputElement).step = IRangeModel(model).stepSize.toString();
- }*/
}
COMPILE::JS
@@ -192,23 +173,17 @@ package org.apache.flex.mdl
input = document.createElement('input') as HTMLInputElement;
input.type = "range";
input.className = typeNames;
-
- input.value = IRangeModel(model).value.toString();
- input.min = IRangeModel(model).minimum.toString();
- input.max = IRangeModel(model).maximum.toString();
- input.step = IRangeModel(model).stepSize.toString();
p.appendChild(input);
- element = input as WrappedHTMLElement;
-
+ element = input as WrappedHTMLElement;
positioner = p as WrappedHTMLElement;
(input as WrappedHTMLElement).flexjs_wrapper = this;
element.flexjs_wrapper = this;
-
+
return element;
- }
+ }
private var _className:String;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23e83204/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
index 7c7fcd3..4afb6d8 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/SliderMouseController.as
@@ -94,24 +94,33 @@ package org.apache.flex.mdl.beads.controllers
COMPILE::JS
{
var sliderView:ISliderView = value.getBeadByType(ISliderView) as ISliderView;
- track = sliderView.track as UIBase;
- thumb = sliderView.thumb as UIBase;
-
- goog.events.listen(track.element, goog.events.EventType.CLICK,
- handleTrackClick, false, this);
-
- goog.events.listen(thumb.element, goog.events.EventType.MOUSEDOWN,
- handleThumbDown, false, this);
+ //track = sliderView.track as UIBase;
+ //thumb = sliderView.thumb as UIBase;
+ //goog.events.listen(track.element, goog.events.EventType.CLICK, handleTrackClick, false, this);
+ //goog.events.listen(thumb.element, goog.events.EventType.MOUSEDOWN, handleThumbDown, false, this);
+ goog.events.listen(UIBase(_strand).element, "change", handleChange, false, this);
+ //goog.events.listen(UIBase(_strand).element, "oninput", handleTrackClick, false, this);
}
}
-
- COMPILE::JS
- private var track:UIBase;
-
+
+ /**
+ */
COMPILE::JS
- private var thumb:UIBase;
-
+ private function handleChange(event:BrowserEvent):void
+ {
+ var host:Slider = _strand as Slider;
+
+ rangeModel.value = Number((UIBase(_strand).element as HTMLInputElement).value);
+
+ host.dispatchEvent(new org.apache.flex.events.Event('valueChange'));
+ }
+
+ COMPILE::SWF
+ private var origin:Point;
+ COMPILE::SWF
+ private var thumb:Point;
+
/**
* @private
*/
@@ -139,11 +148,6 @@ package org.apache.flex.mdl.beads.controllers
IEventDispatcher(_strand).dispatchEvent(new Event("valueChange"));
}
- COMPILE::SWF
- private var origin:Point;
- COMPILE::SWF
- private var thumb:Point;
-
/**
* @private
*/
@@ -184,32 +188,41 @@ package org.apache.flex.mdl.beads.controllers
}
/**
- */
COMPILE::JS
- private function handleTrackClick(event:BrowserEvent):void
+ private var track:UIBase;
+
+ COMPILE::JS
+ private var thumb:UIBase;
+
+ COMPILE::JS
+ private var origin:Number;
+
+ COMPILE::JS
+ private var position:int;
+
+ COMPILE::JS
+ private function handleTrackClickOLD(event:BrowserEvent):void
{
+ trace("handleTrackClickOLD...");
var host:Slider = _strand as Slider;
var xloc:Number = event.clientX;
- var p:Number = Math.min(1, xloc / parseInt(track.element.style.width, 10));
- var n:Number = p * (host.maximum - host.minimum) +
- host.minimum;
+ var p:Number = Math.min(1, xloc / parseInt(host.element.style.width, 10));
+ var n:Number = p * (host.maximum - host.minimum) + host.minimum;
host.value = n;
- origin = parseInt(thumb.element.style.left, 10);
- position = parseInt(thumb.element.style.left, 10);
+ origin = parseInt(host.element.style.left, 10);
+ position = parseInt(host.element.style.left, 10);
calcValFromMousePosition(event, true);
host.dispatchEvent(new org.apache.flex.events.Event('valueChange'));
}
-
-
- /**
- */
+
COMPILE::JS
private function handleThumbDown(event:BrowserEvent):void
{
+ trace("handleThumbDown...");
var host:Slider = _strand as Slider;
goog.events.listen(host.element, goog.events.EventType.MOUSEUP,
handleThumbUp, false, this);
@@ -217,19 +230,13 @@ package org.apache.flex.mdl.beads.controllers
handleThumbMove, false, this);
origin = event.clientX;
- position = parseInt(thumb.element.style.left, 10);
+ position = parseInt(host.element.style.left, 10);
}
-
- COMPILE::JS
- private var origin:Number;
- COMPILE::JS
- private var position:int;
-
- /**
- */
+
COMPILE::JS
private function handleThumbUp(event:BrowserEvent):void
{
+ trace("handleThumbUp...");
var host:Slider = _strand as Slider;
goog.events.unlisten(host.element, goog.events.EventType.MOUSEUP,
handleThumbUp, false, this);
@@ -240,45 +247,40 @@ package org.apache.flex.mdl.beads.controllers
host.dispatchEvent(new org.apache.flex.events.Event('valueChange'));
}
-
-
- /**
- */
+
COMPILE::JS
private function handleThumbMove(event:BrowserEvent):void
{
+ trace("handleThumbMove...");
var host:Slider = _strand as Slider;
calcValFromMousePosition(event, false);
host.dispatchEvent(new org.apache.flex.events.Event('valueChange'));
}
-
-
- /**
- */
+
COMPILE::JS
private function calcValFromMousePosition(event:BrowserEvent, useOffset:Boolean):void
{
+ trace("calcValFromMousePosition...");
var host:Slider = _strand as Slider;
var deltaX:Number = (useOffset ? event.offsetX : event.clientX) - origin;
- var thumbW:int = parseInt(thumb.element.style.width, 10) / 2;
+ var thumbW:int = parseInt(host.element.style.width, 10) / 2;
var newX:Number = position + deltaX;
- var p:Number = newX / parseInt(track.element.style.width, 10);
+ var p:Number = newX / parseInt(host.element.style.width, 10);
var n:Number = p * (host.maximum - host.minimum) +
host.minimum;
n = host.snap(n);
if (n < host.minimum) n = host.minimum;
else if (n > host.maximum) n = host.maximum;
- p = (n - host.minimum) / (host.maximum -
- host.minimum);
- newX = p * parseInt(track.element.style.width, 10);
+ p = (n - host.minimum) / (host.maximum - host.minimum);
+ newX = p * parseInt(host.element.style.width, 10);
- thumb.element.style.left = String(newX -
- parseInt(thumb.element.style.width, 10) / 2) + 'px';
+ //thumb.element.style.left = String(newX -
+ // parseInt(thumb.element.style.width, 10) / 2) + 'px';
host.value = n;
- }
+ }*/
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23e83204/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
index d578b70..cbd5ade 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/SliderView.as
@@ -61,59 +61,6 @@ package org.apache.flex.mdl.beads.views
{
}
- private var rangeModel:IRangeModel;
-
- /**
- * @copy org.apache.flex.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- override public function set strand(value:IStrand):void
- {
- super.strand = value;
-
- COMPILE::SWF {
- var s:UIBase = UIBase(_strand);
-
- _track = new Button();
- _track.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead);
- _track.className = "SliderTrack";
- s.addElement(_track);
-
- _thumb = new Button();
- _thumb.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead);
- _thumb.className = "SliderThumb";
- s.addElement(_thumb);
-
- }
- COMPILE::JS {
- _track = new Button();
- //_track.className = "SliderTrack";
- UIBase(_strand).addElement(_track);
-
- _thumb = new Button();
- //_thumb.className = "SliderThumb";
- UIBase(_strand).addElement(_thumb);
- }
-
- IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
- IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
-
- rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
-
- // listen for changes to the model and adjust the UI accordingly.
- IEventDispatcher(rangeModel).addEventListener("valueChange",modelChangeHandler);
- IEventDispatcher(rangeModel).addEventListener("minimumChange",modelChangeHandler);
- IEventDispatcher(rangeModel).addEventListener("maximumChange",modelChangeHandler);
- IEventDispatcher(rangeModel).addEventListener("stepSizeChange",modelChangeHandler);
- IEventDispatcher(rangeModel).addEventListener("snapIntervalChange",modelChangeHandler);
-
- sizeChangeHandler(null);
- }
-
private var _track:Button;
private var _thumb:Button;
@@ -143,28 +90,47 @@ package org.apache.flex.mdl.beads.views
{
return _thumb;
}
+
+ private var rangeModel:IRangeModel;
/**
- * @private
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
*/
- private function sizeChangeHandler( event:Event ) : void
+ override public function set strand(value:IStrand):void
{
- var host:UIBase = UIBase(_strand);
- var w:Number = host.width;
- var h:Number = host.height;
+ super.strand = value;
- _thumb.width = 20;
- _thumb.height = host.height;
-
- // the track is inset 1/2 of the thumbwidth so the thumb can
- // overlay the track on either end with the thumb center being
- // on the track's edge
- _track.width = host.width - _thumb.width;
- _track.height = 5;
- _track.x = _thumb.width/2;
- _track.y = (host.height - _track.height)/2;
+ COMPILE::SWF {
+ var s:UIBase = UIBase(_strand);
+
+ _track = new Button();
+ _track.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead);
+ _track.className = "SliderTrack";
+ s.addElement(_track);
+
+ _thumb = new Button();
+ _thumb.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead);
+ _thumb.className = "SliderThumb";
+ s.addElement(_thumb);
+
+ }
- setThumbPositionFromValue(rangeModel.value);
+ rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
+
+ // listen for changes to the model and adjust the UI accordingly.
+ IEventDispatcher(rangeModel).addEventListener("stepSizeChange",modelChangeHandler);
+ IEventDispatcher(rangeModel).addEventListener("minimumChange",modelChangeHandler);
+ IEventDispatcher(rangeModel).addEventListener("maximumChange",modelChangeHandler);
+ IEventDispatcher(rangeModel).addEventListener("valueChange",modelChangeHandler);
+ //IEventDispatcher(rangeModel).addEventListener("snapIntervalChange",modelChangeHandler);
+
+ //init view values
+ modelChangeHandler(null);
}
/**
@@ -172,17 +138,13 @@ package org.apache.flex.mdl.beads.views
*/
private function modelChangeHandler( event:Event ) : void
{
- setThumbPositionFromValue(rangeModel.value);
- }
-
- /**
- * @private
- */
- private function setThumbPositionFromValue( value:Number ) : void
- {
- var p:Number = (value-rangeModel.minimum)/(rangeModel.maximum-rangeModel.minimum);
- var xloc:Number = (p*_track.width);
- _thumb.x = xloc;
+ COMPILE::JS
+ {
+ (UIBase(_strand).element as HTMLInputElement).step = rangeModel.stepSize.toString();
+ (UIBase(_strand).element as HTMLInputElement).min = rangeModel.minimum.toString();
+ (UIBase(_strand).element as HTMLInputElement).max = rangeModel.maximum.toString();
+ (UIBase(_strand).element as HTMLInputElement).value = rangeModel.value.toString();
+ }
}
}
}
[32/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] -
fix up ant build
Posted by bi...@apache.org.
fix up ant 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/354c8dc0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/354c8dc0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/354c8dc0
Branch: refs/heads/feature/fontawesome
Commit: 354c8dc08d227cf00eaadd2a105e078ee3ec3d7c
Parents: ffd738d
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jan 3 10:38:02 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jan 3 10:38:12 2017 -0800
----------------------------------------------------------------------
examples/flexjs/MDLExample/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/354c8dc0/examples/flexjs/MDLExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/build.xml b/examples/flexjs/MDLExample/build.xml
index 27967de..226b10d 100644
--- a/examples/flexjs/MDLExample/build.xml
+++ b/examples/flexjs/MDLExample/build.xml
@@ -27,7 +27,7 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <property name="opt1_arg" value="-compiler.exclude-defaults-css-files=HTML-0.8.0-SNAPSHOT.swc:defaults.css" />
+ <property name="opt1_arg" value="-compiler.exclude-defaults-css-files=HTML.swc:defaults.css" />
<property name="opt2_arg" value="-html-template=${basedir}/src/main/resources/mdl-js-index-template.html" />
<include file="${basedir}/../../build_example.xml" />