git commit: [flex-utilities] [refs/heads/develop] - Update README.md
Repository: flex-utilities Updated Branches: refs/heads/develop 4d898afa7 -> 8b168c154 Update README.md Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/8b168c15 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/8b168c15 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/8b168c15 Branch: refs/heads/develop Commit: 8b168c154b5fba0eeba3e7a064f64b4d4d930e47 Parents: 4d898af Author: Om Muppirala Authored: Tue Jun 27 23:04:13 2017 +0530 Committer: Om Muppirala Committed: Tue Jun 27 23:04:13 2017 +0530 -- npm-flexjs/README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8b168c15/npm-flexjs/README.md -- diff --git a/npm-flexjs/README.md b/npm-flexjs/README.md index d094e72..da84a37 100644 --- a/npm-flexjs/README.md +++ b/npm-flexjs/README.md @@ -54,21 +54,21 @@ HTML5/JavaScript output) Windows: - mxmlc C:\Users\\AppData\Roaming\npm\node_modules\flexjs\examples\flexjs\ChartExample\src\ChartExample.mxml + mxmlc C:\Users\\AppData\Roaming\npm\node_modules\flexjs\examples\flexjs\ChartExample\src\main\flex\ChartExample.mxml Mac: - mxmlc /usr/local/lib/node_modules/flexjs/examples/flexjs/ChartExample/src/ChartExample.mxml + mxmlc /usr/local/lib/node_modules/flexjs/examples/flexjs/ChartExample/src/main/flex/ChartExample.mxml ASJSC (Write ActionScript3 targeting HTML5/SVG DOM without requiring JavaScript): Windows: - asjsc C:\Users\\AppData\Roaming\npm\node_modules\flexjs\examples\native\USStatesMap\src\USStatesMap.as + asjsc C:\Users\\AppData\Roaming\npm\node_modules\flexjs\examples\native\USStatesMap\src\main\flex\USStatesMap.as Mac: - asjsc /usr/local/lib/node_modules/flexjs/examples/native/USStatesMap/src/USStatesMap.as + asjsc /usr/local/lib/node_modules/flexjs/examples/native/USStatesMap/src/main/flex/USStatesMap.as You may need to copy the examples to a writeable folder because the compilation will generate an output folder in the example folders.
git commit: [flex-asjs] [refs/heads/develop] - Animate bead for FontAwesomeIcon now responds to property changes
Repository: flex-asjs Updated Branches: refs/heads/develop 098018e76 -> daffc0286 Animate bead for FontAwesomeIcon now responds to property 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/daffc028 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/daffc028 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/daffc028 Branch: refs/heads/develop Commit: daffc02861a14489239e81483b95f8508f3a2136 Parents: 098018e Author: OmPrakash Muppirala Authored: Sat Jan 14 00:13:05 2017 -0800 Committer: OmPrakash Muppirala Committed: Sat Jan 14 00:13:36 2017 -0800 -- .../main/flex/itemRenderers/MemberItemRenderer.mxml| 10 -- .../src/main/flex/org/apache/flex/fa/beads/Animate.as | 13 ++--- 2 files changed, 18 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daffc028/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index ddd0a89..ae78d4c 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -37,6 +37,12 @@ limitations under the License. return data as MemberVO; } +[Bindable] private var _spin:Boolean = false; + +private function handleCogClick():void { +_spin= !_spin; +} + ]]> @@ -85,11 +91,11 @@ limitations under the License. - + - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daffc028/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as index e22501c..5e699db 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as @@ -34,6 +34,7 @@ public class Animate implements IBead { } private var _strand:IStrand; +private var _hostElement:Object; private var _spin:Boolean = true; private var _pulse:Boolean = false; @@ -53,6 +54,9 @@ public class Animate implements IBead { public function set spin(value:Boolean):void { _spin = value; +if(this._hostElement) { +_hostElement.classList.toggle('fa-spin', _spin); +} } /** * Pulse the icon, i.e. rotate with 8 steps @@ -70,6 +74,9 @@ public class Animate implements IBead { public function set pulse(value:Boolean):void { _pulse = value; +if(this._hostElement) { +_hostElement.classList.toggle('fa-pulse',_pulse); +} } /** @@ -84,9 +91,9 @@ public class Animate implements IBead { COMPILE::JS { var host:UIBase = value as UIBase; -var element:HTMLElement = host.element as HTMLElement; -element.classList.toggle('fa-spin',_spin); -element.classList.toggle('fa-pulse',_pulse); +_hostElement = host.element; +_hostElement.classList.toggle('fa-spin',_spin); +_hostElement.classList.toggle('fa-pulse',_pulse); } }
[31/35] git commit: [flex-asjs] [refs/heads/develop] - Add Animate bead for FontAwesomeIcon
Add Animate bead for FontAwesomeIcon Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5c227d43 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5c227d43 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5c227d43 Branch: refs/heads/develop Commit: 5c227d4302f123c023e0f073caf4438d7c89f36f Parents: b7a3da3 Author: OmPrakash Muppirala Authored: Mon Jan 9 00:13:53 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 00:13:53 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml | 25 +- .../flex/org/apache/flex/fa/beads/Animate.as| 95 .../src/main/resources/fa-manifest.xml | 1 + 3 files changed, 118 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c227d43/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index d32fc78..3d47333 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -80,11 +80,30 @@ limitations under the License. +showBorder="true"> + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c227d43/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as new file mode 100644 index 000..4185b0f --- /dev/null +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as @@ -0,0 +1,95 @@ + +// +// 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.fa.beads { +import org.apache.flex.core.IBead; +import org.apache.flex.core.IStrand; +import org.apache.flex.core.UIBase; +import org.osmf.elements.HTMLElement; + +public class Animate implements IBead { +/** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public function Animate() { +} + +private var _strand:IStrand; +private var _spin:Boolean = true; +private var _pulse:Boolean = false; + +/** + * Rotate the icon + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public function get spin():Boolean +{ +return _spin; +} + +public function set spin(value:Boolean):void +{ +_spin = value; +} +/** + * Pulse the icon, i.e. rotate with 8 steps + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public function get pulse():Boolean +{ +return _pulse; +} + +public function set pulse(value:Boolean):void +{ +
[21/35] git commit: [flex-asjs] [refs/heads/develop] - Fix bug FLEX-35239 - If in watchers map source of our data binding and event name do not exist make ConstantBinding - If ConstantBinding during i
Fix bug FLEX-35239 - If in watchers map source of our data binding and event name do not exist make ConstantBinding - If ConstantBinding during initialization won't find in "document" source - trying to create class from sourceID string Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b516503b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b516503b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b516503b Branch: refs/heads/develop Commit: b516503befd2b2e4a75a5c0cf9c3bd190c51093c Parents: fa00540 Author: piotrz Authored: Sat Jan 7 00:55:12 2017 +0100 Committer: piotrz Committed: Sat Jan 7 00:55:12 2017 +0100 -- .../org/apache/flex/binding/ConstantBinding.as | 82 .../flex/binding/ItemRendererDataBinding.as | 49 2 files changed, 86 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b516503b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ConstantBinding.as -- diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ConstantBinding.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ConstantBinding.as index 70cb124..ac3d1d6 100644 --- a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ConstantBinding.as +++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ConstantBinding.as @@ -21,7 +21,11 @@ package org.apache.flex.binding import org.apache.flex.core.IBead; import org.apache.flex.core.IStrand; import org.apache.flex.core.IDocument; - + +COMPILE::SWF +{ +import flash.utils.getDefinitionByName; +} /** * The ConstantBinding class is lightweight data-binding class that * is optimized for simple assignments of one object's constant to @@ -126,17 +130,53 @@ package org.apache.flex.binding */ public function set strand(value:IStrand):void { +var val:* = null; +var objectFromWindow:Object = null; + if (destination == null) destination = value; if (sourceID != null) - source = document[sourceID]; +{ +source = document[sourceID]; +} else +{ source = document; -var val:*; -if (sourcePropertyName in source) +} + +if (!source) +{ +try +{ +COMPILE::SWF +{ +var classFromSourceId:Class = getDefinitionByName(sourceID) as Class; +if (classFromSourceId) +{ +val = classFromSourceId[sourcePropertyName]; +} +} + +COMPILE::JS +{ +objectFromWindow = getObjectClassFromWindow(sourceID); +if (objectFromWindow) +{ +val = objectFromWindow[sourcePropertyName]; +} +} +destination[destinationPropertyName] = val; +} +catch (e:Error) +{ + +} +} +else if (sourcePropertyName in source) { -try { +try +{ val = source[sourcePropertyName]; destination[destinationPropertyName] = val; } @@ -146,7 +186,8 @@ package org.apache.flex.binding } else if (sourcePropertyName in source.constructor) { -try { +try +{ val = source.constructor[sourcePropertyName]; destination[destinationPropertyName] = val; } @@ -164,13 +205,11 @@ package org.apache.flex.binding if (cname) { cname = cname.names[0].qName; -var parts:Array = cname.split('.'); -var n:int = parts.length; -var o:Object = window; -for (var i:int = 0; i < n; i++) { -o = o[parts[i]]; +objectFromWindow = getObjectClassFromWindow(cname); +if (objectFromWindow) +{ +val = objectFromWindow[sourcePropertyName];
[02/35] git commit: [flex-asjs] [refs/heads/develop] - Ignore .iml files from rat report
Ignore .iml files from rat report Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64b46a8b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64b46a8b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64b46a8b Branch: refs/heads/develop Commit: 64b46a8b8b52e0e7bcd54ef37b12778dfd9754f6 Parents: 156d1b4 Author: OmPrakash Muppirala Authored: Tue Jan 3 02:15:52 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 3 02:15:52 2017 -0800 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64b46a8b/pom.xml -- diff --git a/pom.xml b/pom.xml index a32cbaa..fad1c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -184,6 +184,8 @@ native/** testsuite/** + + **/*.iml
[20/35] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/fontawesome
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/fa005409 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fa005409 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fa005409 Branch: refs/heads/develop Commit: fa0054093a6ab94af8deba6a0a1beefd4936cfdd Parents: 4818e6d ae56b06 Author: piotrz Authored: Fri Jan 6 19:38:03 2017 +0100 Committer: piotrz Committed: Fri Jan 6 19:38:03 2017 +0100 -- .../src/main/flex/MyInitialView.mxml| 2 - .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 10 + .../flex/html/beads/layouts/DataGridLayout.as | 18 ++--- .../src/main/flex/org/apache/flex/mdl/TabBar.as | 3 +- .../src/main/flex/org/apache/flex/mdl/Tabs.as | 9 + .../org/apache/flex/mdl/beads/views/TabsView.as | 40 6 files changed, 65 insertions(+), 17 deletions(-) --
[33/35] git commit: [flex-asjs] [refs/heads/develop] - Clean up
Clean up Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1a4c5346 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1a4c5346 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1a4c5346 Branch: refs/heads/develop Commit: 1a4c534681ab13179e1bfc4b618f639bc811d93a Parents: d5120ff Author: OmPrakash Muppirala Authored: Mon Jan 9 01:22:09 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 01:22:09 2017 -0800 -- .../src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 4 ++-- .../src/main/flex/org/apache/flex/fa/beads/Animate.as| 1 - 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a4c5346/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 04b5715..d171573 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 @@ -180,7 +180,7 @@ package org.apache.flex.fa return _showBorder; } -public function set showBorder(value:Boolean) +public function set showBorder(value:Boolean):void { _showBorder = value; COMPILE::JS @@ -203,7 +203,7 @@ package org.apache.flex.fa return _rotation; } -public function set rotation(value:String) +public function set rotation(value:String):void { COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a4c5346/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as index 4185b0f..e22501c 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as @@ -20,7 +20,6 @@ package org.apache.flex.fa.beads { import org.apache.flex.core.IBead; import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; -import org.osmf.elements.HTMLElement; public class Animate implements IBead { /**
[26/35] git commit: [flex-asjs] [refs/heads/develop] - - Remove from the MXML FontAwesomeIconType and FontAwesomeIconSize - Core artifact is not needed - remove from pom
- Remove from the MXML FontAwesomeIconType and FontAwesomeIconSize - Core artifact is not needed - remove from pom Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/404e55e4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/404e55e4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/404e55e4 Branch: refs/heads/develop Commit: 404e55e4cfd6e4bfb48021a070f156bb06b82675 Parents: 4854755 Author: piotrz Authored: Sat Jan 7 12:24:35 2017 +0100 Committer: piotrz Committed: Sat Jan 7 12:24:35 2017 +0100 -- examples/flexjs/FlexTeamPage_MDL/pom.xml | 6 -- .../projects/FontAwesome/src/main/resources/fa-manifest.xml| 2 -- 2 files changed, 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/404e55e4/examples/flexjs/FlexTeamPage_MDL/pom.xml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/pom.xml b/examples/flexjs/FlexTeamPage_MDL/pom.xml index 1d59ee1..51e67e0 100644 --- a/examples/flexjs/FlexTeamPage_MDL/pom.xml +++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml @@ -89,12 +89,6 @@ 0.8.0-SNAPSHOT swc - - org.apache.flex.flexjs.framework - Core - 0.8.0-SNAPSHOT - swc - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/404e55e4/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml -- diff --git a/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml b/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml index bd52976..a6fe235 100644 --- a/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml +++ b/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml @@ -21,6 +21,4 @@ - -
[29/35] git commit: [flex-asjs] [refs/heads/develop] - Add support for border
Add support for border Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/62beb260 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/62beb260 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/62beb260 Branch: refs/heads/develop Commit: 62beb260e3c64b0cc7f6afa123c3cddca96484ed Parents: 4d34b48 Author: OmPrakash Muppirala Authored: Sun Jan 8 00:17:51 2017 -0800 Committer: OmPrakash Muppirala Committed: Sun Jan 8 00:17:51 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml| 7 --- .../flex/org/apache/flex/fa/FontAwesomeIcon.as| 18 ++ 2 files changed, 22 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/62beb260/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index 09484b2..d32fc78 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -79,12 +79,13 @@ limitations under the License. - + - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/62beb260/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 62f3189..a2a8ed1 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 @@ -64,6 +64,7 @@ package org.apache.flex.fa protected var _iconType:String; protected var _size:String; protected var _fixedWidth:Boolean; +protected var _showBorder:Boolean; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -151,6 +152,23 @@ package org.apache.flex.fa element.classList.toggle('fa-fw',_fixedWidth); } } + +/** + * Show a border around the icon + */ +public function get showBorder():Boolean +{ +return _showBorder; +} + +public function set showBorder(value:Boolean) +{ +_showBorder = value; +COMPILE::JS +{ +element.classList.toggle('fa-border',_showBorder) +} +} } }
[17/35] git commit: [flex-asjs] [refs/heads/develop] - Add the inject_html directive to the constructor asdoc comment instead of the class's asdoc comments
Add the inject_html directive to the constructor asdoc comment instead of the class's asdoc comments Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/633ed106 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/633ed106 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/633ed106 Branch: refs/heads/develop Commit: 633ed10620c22fb1f982481be59d1abed20f6043 Parents: a20d30a Author: OmPrakash Muppirala Authored: Wed Jan 4 12:06:02 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 12:06:02 2017 -0800 -- .../src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/633ed106/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 05b5ec4..e193b0d 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 @@ -35,9 +35,6 @@ package org.apache.flex.fa * @playerversion AIR 2.6 * @productversion FlexJS 0.0 * -* -* http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> -* * */ public class FontAwesomeIcon extends UIBase @@ -51,6 +48,9 @@ package org.apache.flex.fa * @productversion FlexJS 0.0 * * @flexjsignorecoercion HTMLElement +* +* http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> +* */ public function FontAwesomeIcon() {
[24/35] git commit: [flex-asjs] [refs/heads/develop] - Push changes in order to test class names fixes from Alex
Push changes in order to test class names fixes from Alex Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0f9afd8c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0f9afd8c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0f9afd8c Branch: refs/heads/develop Commit: 0f9afd8c19bcaee626f24dcacce4acbc809ac3e9 Parents: 4ae4795 Author: piotrz Authored: Sat Jan 7 01:18:22 2017 +0100 Committer: piotrz Committed: Sat Jan 7 01:18:22 2017 +0100 -- .../src/main/flex/itemRenderers/MemberItemRenderer.mxml | 11 ++- .../FontAwesome/src/main/resources/fa-manifest.xml | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0f9afd8c/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index 7edae67..ab1ff19 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -26,6 +26,7 @@ limitations under the License.
[30/35] git commit: [flex-asjs] [refs/heads/develop] - Fix ASDoc as per code review
Fix ASDoc as per code review Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b7a3da36 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b7a3da36 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b7a3da36 Branch: refs/heads/develop Commit: b7a3da36c2e6d8f43819b498c8c5fc9907557735 Parents: 62beb26 Author: OmPrakash Muppirala Authored: Sun Jan 8 23:07:37 2017 -0800 Committer: OmPrakash Muppirala Committed: Sun Jan 8 23:07:37 2017 -0800 -- .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 30 1 file changed, 24 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b7a3da36/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 a2a8ed1..9a1022b 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 @@ -110,8 +110,13 @@ package org.apache.flex.fa } /** - * To increase icon sizes relative to their container, - * use the X1 (33% increase), X2, X3, X4, or X5. + * To increase icon sizes relative to their container, + * use the X1 (33% increase), X2, X3, X4, or X5. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 * */ public function get size():String @@ -135,9 +140,16 @@ package org.apache.flex.fa } /** - * Set icons at a fixed width. - * Great to use when different icon widths throw off alignment. - * Especially useful in things like nav lists & list groups. + * + * Set icons at a fixed width. + * Great to use when different icon widths throw off alignment. + * Especially useful in things like nav lists & list groups. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * */ public function get fixedWidth():Boolean { @@ -154,7 +166,13 @@ package org.apache.flex.fa } /** - * Show a border around the icon + * Show a border around the icon + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * */ public function get showBorder():Boolean {
[13/35] git commit: [flex-asjs] [refs/heads/develop] - Upgrade to latest verions (4.7) of FontAwesome icons
Upgrade to latest verions (4.7) of FontAwesome icons Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b4ff8198 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b4ff8198 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b4ff8198 Branch: refs/heads/develop Commit: b4ff8198387839f479dd6b2fdd0832c1c2716e9c Parents: 09d57a3 Author: OmPrakash Muppirala Authored: Wed Jan 4 02:11:32 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:15:31 2017 -0800 -- .../FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4ff8198/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html index d329f95..5999f04 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html @@ -24,7 +24,7 @@ https://fonts.googleapis.com/icon?family=Material+Icons";> https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css";> - http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css";> + http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> https://code.getmdl.io/1.2.1/material.min.js";> ${head}
[28/35] git commit: [flex-asjs] [refs/heads/develop] - Add some comments
Add some comments Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4d34b482 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4d34b482 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4d34b482 Branch: refs/heads/develop Commit: 4d34b48204742acce678c602df764de73214d2a7 Parents: 7c793d5 Author: OmPrakash Muppirala Authored: Sat Jan 7 23:20:13 2017 -0800 Committer: OmPrakash Muppirala Committed: Sat Jan 7 23:20:13 2017 -0800 -- .../main/flex/itemRenderers/MemberItemRenderer.mxml| 2 +- .../main/flex/org/apache/flex/fa/FontAwesomeIcon.as| 13 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d34b482/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index 4456822..09484b2 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -74,7 +74,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d34b482/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 b25cea2..62f3189 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 @@ -107,8 +107,12 @@ package org.apache.flex.fa element.classList.add(_iconType); } } - - + +/** + * To increase icon sizes relative to their container, + * use the X1 (33% increase), X2, X3, X4, or X5. + * + */ public function get size():String { return _size; @@ -129,6 +133,11 @@ package org.apache.flex.fa } } +/** + * Set icons at a fixed width. + * Great to use when different icon widths throw off alignment. + * Especially useful in things like nav lists & list groups. + */ public function get fixedWidth():Boolean { return _fixedWidth;
[10/35] git commit: [flex-asjs] [refs/heads/develop] - Add FontAwesome swc to distribution package
Add FontAwesome swc to distribution package Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f2eecbf8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f2eecbf8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f2eecbf8 Branch: refs/heads/develop Commit: f2eecbf8dd860af8edfc352bfd439f71aaef1861 Parents: 413902c Author: piotrz Authored: Wed Jan 4 09:12:49 2017 +0100 Committer: piotrz Committed: Wed Jan 4 09:12:49 2017 +0100 -- distribution/pom.xml | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f2eecbf8/distribution/pom.xml -- diff --git a/distribution/pom.xml b/distribution/pom.xml index 027f5d2..a4eeb43 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -269,6 +269,12 @@ swc typedefs + + org.apache.flex.flexjs.framework + FontAwesome + 0.8.0-SNAPSHOT + swc + org.apache.flex.flexjs.framework GoogleMaps
[14/35] git commit: [flex-asjs] [refs/heads/develop] - Add support for 'size' functionality
Add support for 'size' 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/79b255c1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/79b255c1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/79b255c1 Branch: refs/heads/develop Commit: 79b255c10d4a05aa77b5982c7fa1938e6f5121ea Parents: b4ff819 Author: OmPrakash Muppirala Authored: Wed Jan 4 02:13:27 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:16:18 2017 -0800 -- .../FontAwesome/src/main/flex/FAClasses.as | 5 ++-- .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 28 +--- 2 files changed, 28 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79b255c1/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as index e231687..e5dcd47 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as +++ b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as @@ -27,8 +27,9 @@ package */ internal class FAClasses { - import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; - } + import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; + import org.apache.flex.fa.FontAwesomeIconSize; FontAwesomeIconSize; + } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79b255c1/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 a734fde..7c86c75 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 @@ -57,6 +57,7 @@ package org.apache.flex.fa COMPILE::JS protected var textNode:Text; protected var _iconType:String; + protected var _size:String; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -86,20 +87,41 @@ package org.apache.flex.fa return _iconType; } - public function set iconType(v:String):void + public function set iconType(value:String):void { COMPILE::JS { -element.classList.remove(v); +element.classList.remove(value); } -_iconType = v; +_iconType = value; COMPILE::JS { element.classList.add(_iconType); } } + + +public function get size():String +{ +return _size; +} + + public function set size(value:String):void +{ +COMPILE::JS +{ +element.classList.remove(value); +} + +_size = value; +COMPILE::JS +{ +element.classList.add(value); +} +} + } }
[19/35] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/fontawesome
Merge branch 'develop' into feature/fontawesome # Conflicts: # frameworks/build.xml Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4818e6d8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4818e6d8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4818e6d8 Branch: refs/heads/develop Commit: 4818e6d830738af1c32b5b44923c587f1e92f496 Parents: 7999699 b7a833d Author: piotrz Authored: Thu Jan 5 11:29:18 2017 +0100 Committer: piotrz Committed: Thu Jan 5 11:29:18 2017 +0100 -- .../main/resources/archetype-resources/pom.xml | 57 ++- .../pom.xml | 36 .../main/resources/META-INF/maven/archetype.xml | 27 +++ .../archetype-resources/.mvn/extensions.xml | 30 .../main/resources/archetype-resources/pom.xml | 141 .../archetype-resources/src/main/flex/App.mxml | 30 .../pom.xml | 42 + .../main/resources/META-INF/maven/archetype.xml | 27 +++ .../archetype-resources/.mvn/extensions.xml | 30 .../main/resources/archetype-resources/pom.xml | 84 ++ .../archetype-resources/src/main/flex/App.mxml | 30 archetypes/pom.xml | 2 + examples/express/DataBindingExample/README.txt | 53 ++ examples/express/DataBindingExample/build.xml | 46 ++ examples/express/DataBindingExample/pom.xml | 75 + .../src/main/flex/DataBindingExample.mxml | 51 ++ .../src/main/flex/MyInitialView.mxml| 132 +++ .../src/main/flex/StockDataJSONItemConverter.as | 40 + .../src/main/flex/controllers/MyController.as | 92 +++ .../src/main/flex/models/MyModel.as | 125 ++ examples/flexjs/DataGridExample/build.xml | 12 ++ .../flexjs/MDLExample/src/main/flex/Lists.mxml | 2 +- .../MDLExample/src/main/flex/MainFooter.mxml| 44 + .../src/main/flex/MainNavigation.mxml | 9 +- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 108 +--- .../CustomTabBarPanelItemRenderer.mxml | 36 .../FooterMiniLinkListItemRenderer.mxml | 32 .../src/main/flex/models/FooterModel.as | 40 + .../src/main/flex/models/TabsModel.as | 49 ++ .../MDLExample/src/main/flex/vos/TabVO.as | 34 .../src/main/resources/mdl-styles.css | 15 ++ frameworks/build.xml| 6 + .../Express/src/main/flex/ExpressClasses.as | 1 + .../flex/org/apache/flex/express/TextInput.as | 117 + .../Express/src/main/resources/defaults.css | 8 + .../src/main/resources/express-manifest.xml | 1 + .../DataItemRendererFactoryForArrayData.as | 14 +- .../src/main/flex/MDLClasses.as | 4 +- .../org/apache/flex/mdl/FooterBottomSection.as | 108 .../org/apache/flex/mdl/FooterLeftSection.as| 3 +- .../flex/org/apache/flex/mdl/FooterLinkList.as | 108 .../main/flex/org/apache/flex/mdl/FooterLogo.as | 99 +++ .../org/apache/flex/mdl/FooterRightSection.as | 3 +- .../org/apache/flex/mdl/FooterTopSection.as | 108 .../src/main/flex/org/apache/flex/mdl/TabBar.as | 72 +++- .../src/main/flex/org/apache/flex/mdl/Tabs.as | 67 +++- .../TabsItemRendererFactoryForArrayData.as | 164 +++ .../apache/flex/mdl/beads/models/ITabModel.as | 39 + .../apache/flex/mdl/beads/models/TabModel.as| 42 + .../apache/flex/mdl/beads/views/TabBarView.as | 28 .../org/apache/flex/mdl/beads/views/TabsView.as | 28 .../mdl/itemRenderers/FooterLinkItemRenderer.as | 124 ++ .../TabBarButtonLayoutItemRenderer.as | 46 ++ .../TabBarButtonTabsItemRenderer.as | 46 ++ .../itemRenderers/TabBarLayoutItemRenderer.as | 56 +++ .../itemRenderers/TabBarPanelItemRenderer.as| 56 +++ .../flex/mdl/supportClasses/IFooterSection.as | 28 .../flex/mdl/supportClasses/ITabItemRenderer.as | 31 .../TabBarButtonItemRendererBase.as | 108 .../mdl/supportClasses/TabItemRendererBase.as | 87 ++ .../src/main/resources/defaults.css | 25 +++ .../src/main/resources/mdl-manifest.xml | 23 ++- 62 files changed, 3126 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4818e6d8/frameworks/build.xml -- diff --cc frameworks/build.xml index 638ccb1,1b4154c..97066c2 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@@ -98,7 -98,7 +98,8 @@@ + +
[09/35] git commit: [flex-asjs] [refs/heads/develop] - Try using fontawesome icon component in fexlteampage_mdl example project
Try using fontawesome icon component in fexlteampage_mdl example 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/413902c8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/413902c8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/413902c8 Branch: refs/heads/develop Commit: 413902c8390fed988495c83909de4cd6175f9f08 Parents: e17a8ff Author: OmPrakash Muppirala Authored: Tue Jan 3 23:37:35 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 3 23:37:35 2017 -0800 -- .../src/main/flex/itemRenderers/MemberItemRenderer.mxml| 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/413902c8/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index da4a07c..b479aa5 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -22,10 +22,12 @@ limitations under the License. xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:fa="library://ns.apache.org/flexjs/fa" xmlns="http://www.w3.org/1999/xhtml"; - xmlns:components="components.*" > + >
[03/35] git commit: [flex-asjs] [refs/heads/develop] - First cut of Flex Team Page using FlexJS and MDL library (WIP)
First cut of Flex Team Page using FlexJS and MDL library (WIP) Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d10a3925 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d10a3925 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d10a3925 Branch: refs/heads/develop Commit: d10a3925b43b982108e600c2c3bc67cc30a730db Parents: 64b46a8 Author: OmPrakash Muppirala Authored: Tue Jan 3 02:16:30 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 3 02:16:30 2017 -0800 -- examples/flexjs/FlexTeamPage_MDL/pom.xml| 109 + .../FlexTeamPage_MDL/src/main/flex/App.mxml | 35 ++ .../src/main/flex/MainView.mxml | 45 +++ .../flex/itemRenderers/MemberItemRenderer.mxml | 81 .../src/main/flex/models/MembersModel.as| 81 .../src/main/flex/vos/MemberVO.as | 41 +++ .../src/main/resources/assets/transparent.jpg | Bin 0 -> 344605 bytes .../main/resources/mdl-js-index-template.html | 34 ++ .../src/main/resources/mdl-styles.css | 122 +++ 9 files changed, 548 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d10a3925/examples/flexjs/FlexTeamPage_MDL/pom.xml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/pom.xml b/examples/flexjs/FlexTeamPage_MDL/pom.xml new file mode 100644 index 000..1d59ee1 --- /dev/null +++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml @@ -0,0 +1,109 @@ + + +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";> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples-flexjs +0.8.0-SNAPSHOT + + + FlexTeamPage_MDL + 0.8.0-SNAPSHOT + swf + + Apache Flex - FlexJS: Examples: FlexJS: FlexTeamPage_MDL + + + +indigo +pink + + + +src/main/flex + + +src/main/resources +true + + + + +org.apache.flex.flexjs.compiler +flexjs-maven-plugin +true + + App.mxml + ${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html + -compiler.exclude-defaults-css-files=HTML-0.8.0-SNAPSHOT.swc:defaults.css + + + +org.apache.maven.plugins +maven-war-plugin + + +org.codehaus.mojo +build-helper-maven-plugin + + + + + + + org.apache.flex.flexjs.framework + MaterialDesignLite + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework + FontAwesome + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework + Network + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework + Core + 0.8.0-SNAPSHOT + swc + + + + + com.adobe.flash.framework + playerglobal + 20.0 + swc + provided + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d10a3925/examples/flexjs/FlexTeamPage_MDL/src/main/flex/App.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/App.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/App.mxml new file mode 100644 index 000..93f3429 --- /dev/null +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/App.mxml @@ -0,0 +1,35 @@ + + + +http://ns.adobe.com/mxml/2009"; +xmlns:js="library://ns.apache.org/flexjs/basic" +xmlns:local="*" +xmlns="http://www.w3.org/1999/xhtml";> + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d10a3925/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml new file mode 100644 index 000..4c53118 --- /dev/null +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml @@ -0,0 +1,45 @@ + + +http://ns.adobe.com/mxml/2009"; +xmlns:basic="library://ns.apache.org/flexjs/basic" xmlns:models="models.*" +xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:binding="org.apache.flex.binding.*"> + + + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/
[12/35] git commit: [flex-asjs] [refs/heads/develop] - Use FontAwesomeIcon instead of I element in example
Use FontAwesomeIcon instead of I element 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/09d57a3c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/09d57a3c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/09d57a3c Branch: refs/heads/develop Commit: 09d57a3c9ff6943b17f9a3472291635508ff195c Parents: c3332d8 Author: OmPrakash Muppirala Authored: Wed Jan 4 02:11:00 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:15:30 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml | 15 ++ .../org/apache/flex/fa/FontAwesomeIconSize.as | 29 2 files changed, 38 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/09d57a3c/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index b479aa5..7edae67 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -58,26 +58,29 @@ limitations under the License. - + - + - + - + + + + + + - - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/09d57a3c/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as new file mode 100644 index 000..57dff52 --- /dev/null +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as @@ -0,0 +1,29 @@ + +// +// 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.fa +{ +public class FontAwesomeIconSize +{ + public static const X1:String = 'fa-lg'; + public static const X2:String = 'fa-2x'; + public static const X3:String = 'fa-3x'; + public static const X4:String = 'fa-4x'; + public static const X5:String = 'fa-5x'; +} +}
[04/35] git commit: [flex-asjs] [refs/heads/develop] - Add HTMLText component that displays HTML content
Add HTMLText component that displays HTML content Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cac07e4c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cac07e4c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cac07e4c Branch: refs/heads/develop Commit: cac07e4c566681684e59c74d8e6ed926e82f2544 Parents: d10a392 Author: OmPrakash Muppirala Authored: Tue Jan 3 02:17:26 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 3 02:17:26 2017 -0800 -- .../main/flex/org/apache/flex/html/HTMLText.as | 119 +++ .../HTML/src/main/resources/basic-manifest.xml | 1 + 2 files changed, 120 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cac07e4c/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/HTMLText.as -- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/HTMLText.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/HTMLText.as new file mode 100644 index 000..ea60de8 --- /dev/null +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/HTMLText.as @@ -0,0 +1,119 @@ + +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package org.apache.flex.html +{ + import org.apache.flex.core.ITextModel; + import org.apache.flex.core.UIBase; + import org.apache.flex.core.ValuesManager; + import org.apache.flex.events.Event; + import org.apache.flex.events.IEventDispatcher; +COMPILE::JS +{ +import org.apache.flex.core.WrappedHTMLElement; +} + +/** + * The HTMLText class implements the basic control for adding + * HTML formatted text. + * + * @toplevel + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public class HTMLText extends UIBase + { +/** + * Constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function HTMLText() + { + super(); + } + +[Bindable("htmlChange")] +/** + * The html-formatted text to display in the HTMLText. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get html():String + { +COMPILE::SWF +{ +return ITextModel(model).html; +} +COMPILE::JS +{ +return element.innerHTML; +} + } + +/** + * @private + */ + public function set html(value:String):void + { +COMPILE::SWF +{ +ITextModel(model).html = value; +} +COMPILE::JS +{ +this.element.innerHTML = value; +this.dispatchEvent('textChange'); +} + } + +/** + * @private + */ +COMPILE::SWF +override public function addedToParent():void +{ +super.addedToParent(); +model.addEventListener("htmlChange", repeaterListener); +} + +/** + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + */ +COMPILE::JS +override protected function createElement():WrappedHTMLElement +{ +element = document.createElement('span') as WrappedHTMLElement; +positioner = element; +element.flexjs_wrapper = this; + +
[07/35] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/fontawesome
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/develop Commit: 70980a819ae5d34f520fd1da348af17a6769a3d9 Parents: d875d2f a115c71 Author: OmPrakash Muppirala Authored: Tue Jan 3 17:54:03 2017 -0800 Committer: OmPrakash Muppirala 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/
[18/35] git commit: [flex-asjs] [refs/heads/develop] - Fix ant build so it builds fontawesome library as well.
Fix ant build so it builds fontawesome library as well. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/79996993 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/79996993 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/79996993 Branch: refs/heads/develop Commit: 7999699363e157e6cd9cadc9642067176d07dbfe Parents: 633ed10 Author: OmPrakash Muppirala Authored: Wed Jan 4 16:54:47 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 16:54:47 2017 -0800 -- frameworks/build.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79996993/frameworks/build.xml -- diff --git a/frameworks/build.xml b/frameworks/build.xml index a4087eb..638ccb1 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -98,6 +98,7 @@ +
[27/35] git commit: [flex-asjs] [refs/heads/develop] - Add support for fixed-width icons (fa-fw)
Add support for fixed-width icons (fa-fw) Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7c793d55 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7c793d55 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7c793d55 Branch: refs/heads/develop Commit: 7c793d55bdb53f121d1069bbb3c100721e23d005 Parents: 404e55e Author: OmPrakash Muppirala Authored: Sat Jan 7 23:14:21 2017 -0800 Committer: OmPrakash Muppirala Committed: Sat Jan 7 23:14:21 2017 -0800 -- .../main/flex/itemRenderers/MemberItemRenderer.mxml | 3 ++- .../main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 15 +++ 2 files changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7c793d55/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index ab1ff19..4456822 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -79,7 +79,8 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7c793d55/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 e193b0d..b25cea2 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 @@ -63,6 +63,7 @@ package org.apache.flex.fa protected var textNode:Text; protected var _iconType:String; protected var _size:String; +protected var _fixedWidth:Boolean; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -127,6 +128,20 @@ package org.apache.flex.fa element.classList.add(value); } } + +public function get fixedWidth():Boolean +{ +return _fixedWidth; +} + +public function set fixedWidth(value:Boolean):void +{ +_fixedWidth = value; +COMPILE::JS +{ +element.classList.toggle('fa-fw',_fixedWidth); +} +} } }
[08/35] git commit: [flex-asjs] [refs/heads/develop] - Set textContent to empty string, otherwise it will show up as 'undefined'
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/develop Commit: e17a8ff3ca7a91261287a67221e4f60b11988d37 Parents: 70980a8 Author: OmPrakash Muppirala Authored: Tue Jan 3 18:18:34 2017 -0800 Committer: OmPrakash Muppirala 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;
[23/35] git commit: [flex-asjs] [refs/heads/develop] - fix ant build for fontawesome
fix ant build for 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/4ae4795d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4ae4795d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4ae4795d Branch: refs/heads/develop Commit: 4ae4795d069f73c36bcffee87d6e3fd2d2a2722d Parents: 2b4150a Author: Alex Harui Authored: Fri Jan 6 15:57:42 2017 -0800 Committer: Alex Harui Committed: Fri Jan 6 15:57:48 2017 -0800 -- frameworks/build.xml| 5 + .../js/FlexJS/projects/FontAwesomeJS/build.xml | 143 +++ .../src/main/config/compile-js-config.xml | 86 +++ 3 files changed, 234 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4ae4795d/frameworks/build.xml -- diff --git a/frameworks/build.xml b/frameworks/build.xml index 97066c2..5a38893 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -134,6 +134,7 @@ + @@ -209,6 +210,10 @@ + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4ae4795d/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml -- diff --git a/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml b/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml new file mode 100644 index 000..7e7735e --- /dev/null +++ b/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + +target.name.nojs=${ant.project.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4ae4795d/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml -- diff --git a/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml new file mode 100644 index 000..58f08b3 --- /dev/null +++ b/frameworks/js/FlexJS/projects/FontAwesomeJS/src/main/config/compile-js-config.xml @@ -0,0 +1,86 @@ + + + + +false + + + true + + org.apache.flex.events.ValueChangeEvent + org.apache.flex.events.ValueChangeEvent + valueChange + + +COMPILE::SWF +false + + +COMPILE::JS +true + + + + Bindable + Managed + ChangeEvent + NonCommittingChangeEvent + Transient + + + + + + + ../../../../../../../../js/libs/GCL.swc + +../../../../../libs/CoreJS.swc +../../../../../libs/HTMLJS.swc + + + + +library://ns.apache.org/flexjs/fa + ../../../../../../../projects/FontAwesome/src/main/resources/fa-manifest.xml + + + + + ../../../../../../../projects/FontAwesome/src/main/flex + + +false + + + + + + +FAClasses + + + +library://ns.apache.org/flexjs/fa + + + +
[11/35] git commit: [flex-asjs] [refs/heads/develop] - In order to use FontAwesomeIconType in fx:Script - it has to be added in JS compilation
In order to use FontAwesomeIconType in fx:Script - it has to be added in JS 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/c3332d83 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c3332d83 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c3332d83 Branch: refs/heads/develop Commit: c3332d830d6bb0c22cb9559786b8be5f07d9d0c0 Parents: f2eecbf Author: piotrz Authored: Wed Jan 4 09:40:21 2017 +0100 Committer: piotrz Committed: Wed Jan 4 09:40:21 2017 +0100 -- frameworks/projects/FontAwesome/src/main/flex/FAClasses.as | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c3332d83/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as index 96a777e..e231687 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as +++ b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as @@ -27,10 +27,7 @@ package */ internal class FAClasses { - COMPILE::SWF - { - import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; - } + import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; } }
[35/35] git commit: [flex-asjs] [refs/heads/develop] - Add license header
Add license header Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ffcc9a3d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ffcc9a3d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ffcc9a3d Branch: refs/heads/develop Commit: ffcc9a3dc758ad1a670e4ad810e18994a124b60c Parents: 953730e Author: OmPrakash Muppirala Authored: Tue Jan 10 00:23:00 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 10 00:23:00 2017 -0800 -- .../src/main/flex/org/apache/flex/express/List.as | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ffcc9a3d/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as -- diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as index 258ae77..af4e97b 100644 --- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as +++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as @@ -1,3 +1,21 @@ + +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + package org.apache.flex.express { import org.apache.flex.collections.ArrayList;
[22/35] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/fontawesome
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/2b4150a8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2b4150a8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2b4150a8 Branch: refs/heads/develop Commit: 2b4150a87d4a94623b2fbe15c9e864d4a81395b5 Parents: b516503 cf53944 Author: piotrz Authored: Sat Jan 7 00:56:20 2017 +0100 Committer: piotrz Committed: Sat Jan 7 00:56:20 2017 +0100 -- .../src/main/flex/DataBindingExample.mxml | 7 +- .../src/main/flex/MyInitialView.mxml| 9 +-- .../flexjs/MDLExample/src/main/flex/Badges.mxml | 51 + .../src/main/flex/MainNavigation.mxml | 33 +--- .../src/main/config/compile-as-config.xml | 6 ++ .../src/main/resources/express-as-manifest.xml | 26 +++ .../src/main/resources/express-manifest.xml | 80 7 files changed, 174 insertions(+), 38 deletions(-) --
[16/35] git commit: [flex-asjs] [refs/heads/develop] - Attempt to move the font awesome css file to the library itself, instead of in the end app project
Attempt to move the font awesome css file to the library itself, instead of in the end app 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/a20d30ac Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a20d30ac Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a20d30ac Branch: refs/heads/develop Commit: a20d30ac603ebc385a9acb593988714f996d50ec Parents: 36ca8ac Author: OmPrakash Muppirala Authored: Wed Jan 4 02:45:07 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:45:07 2017 -0800 -- .../src/main/resources/mdl-js-index-template.html | 1 - .../src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 5 + 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a20d30ac/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html index 5999f04..62cbf70 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html @@ -24,7 +24,6 @@ https://fonts.googleapis.com/icon?family=Material+Icons";> https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css";> - http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> https://code.getmdl.io/1.2.1/material.min.js";> ${head} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a20d30ac/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 7c86c75..05b5ec4 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 @@ -34,6 +34,11 @@ package org.apache.flex.fa * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 +* +* +* http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> +* +* */ public class FontAwesomeIcon extends UIBase {
[06/35] git commit: [flex-asjs] [refs/heads/develop] - Enumerate all available font awesome types in FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconType.as Remove FontAwesomeIconType from
Enumerate all available font awesome types in FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconType.as Remove FontAwesomeIconType from manifest because it cannot be directly added in mxml. Add it to FAClasses.as instead. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d875d2f4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d875d2f4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d875d2f4 Branch: refs/heads/develop Commit: d875d2f43c57d65787fa0ab8b8126e4b7ca9e063 Parents: 19adaea Author: OmPrakash Muppirala Authored: Tue Jan 3 17:11:55 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 3 17:11:55 2017 -0800 -- .../FontAwesome/src/main/flex/FAClasses.as | 5 +- .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 18 +- .../org/apache/flex/fa/FontAwesomeIconType.as | 699 +++ 3 files changed, 711 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d875d2f4/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as index 976571e..96a777e 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as +++ b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as @@ -26,11 +26,10 @@ package * from the classes specified in manifest.xml. */ internal class FAClasses - { - + { COMPILE::SWF { - + import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d875d2f4/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 6a25ac3..3c46f61 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 @@ -27,6 +27,8 @@ package org.apache.flex.fa /** * Provide common features for all FontAwesome icons type +* Usage example: +* * * @langversion 3.0 * @playerversion Flash 10.2 @@ -54,7 +56,7 @@ package org.apache.flex.fa COMPILE::JS protected var textNode:Text; - protected var _iconText:String; + protected var _iconType:String; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -63,11 +65,11 @@ package org.apache.flex.fa COMPILE::JS override protected function createElement():WrappedHTMLElement { -typeNames = ""; +typeNames = "fa"; var i:HTMLElement = document.createElement('i') as HTMLElement; -textNode = document.createTextNode(iconText) as Text; +textNode = document.createTextNode(iconType) as Text; i.appendChild(textNode); element = i as WrappedHTMLElement; @@ -78,23 +80,23 @@ package org.apache.flex.fa return element; } -public function get iconText():String +public function get iconType():String { -return _iconText; +return _iconType; } - public function set iconText(v:String):void + public function set iconType(v:String):void { COMPILE::JS { element.classList.remove(v); } -_iconText = v; +_iconType = v; COMPILE::JS { -element.classList.add(_iconText); +element.classList.add(_iconType); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d875d2f4/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconType.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconType.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconType.as new file mode 100644 index 000..cdeb94c --- /dev/null +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontA
[25/35] git commit: [flex-asjs] [refs/heads/develop] - add ant script for team page
add ant script for team page Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/48547559 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/48547559 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/48547559 Branch: refs/heads/develop Commit: 48547559abc7a53bf5fe2a2d959a6dbdfb06b639 Parents: 0f9afd8 Author: Alex Harui Authored: Fri Jan 6 22:00:37 2017 -0800 Committer: Alex Harui Committed: Fri Jan 6 22:00:37 2017 -0800 -- examples/flexjs/FlexTeamPage_MDL/build.xml | 63 + 1 file changed, 63 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/48547559/examples/flexjs/FlexTeamPage_MDL/build.xml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/build.xml b/examples/flexjs/FlexTeamPage_MDL/build.xml new file mode 100644 index 000..e711b0e --- /dev/null +++ b/examples/flexjs/FlexTeamPage_MDL/build.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[01/35] git commit: [flex-asjs] [refs/heads/develop] - TBody.as has wrong class name
Repository: flex-asjs Updated Branches: refs/heads/develop d1b6c5d27 -> ffcc9a3dc TBody.as has wrong class name Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/156d1b4b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/156d1b4b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/156d1b4b Branch: refs/heads/develop Commit: 156d1b4bf0019c6beff6412afb12d1c21e7045df Parents: 8263756 Author: OmPrakash Muppirala Authored: Sun Dec 25 22:41:31 2016 -0800 Committer: OmPrakash Muppirala Committed: Tue Dec 27 23:24:32 2016 -0800 -- .../MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/156d1b4b/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 index cfc6928..1535578 100644 --- 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 @@ -34,7 +34,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class THead extends ContainerBase + public class TBody extends ContainerBase { /** * constructor.
[32/35] git commit: [flex-asjs] [refs/heads/develop] - Add support for rotation in FontAwesomeIcon
Add support for rotation in FontAwesomeIcon Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d5120ff7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d5120ff7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d5120ff7 Branch: refs/heads/develop Commit: d5120ff7e63aa909e2282fcebef501610ae2b655 Parents: 5c227d4 Author: OmPrakash Muppirala Authored: Mon Jan 9 00:32:37 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 00:32:37 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml | 3 +- .../FontAwesome/src/main/flex/FAClasses.as | 1 + .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 30 .../apache/flex/fa/FontAwesomeIconRotation.as | 27 ++ 4 files changed, 60 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d5120ff7/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index 3d47333..ddd0a89 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -26,6 +26,7 @@ limitations under the License.
[15/35] git commit: [flex-asjs] [refs/heads/develop] - Fix code formatting
Fix code formatting Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/36ca8acd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/36ca8acd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/36ca8acd Branch: refs/heads/develop Commit: 36ca8acd4df84044c998091f1f1fd535f4b74858 Parents: 79b255c Author: OmPrakash Muppirala Authored: Wed Jan 4 02:18:31 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:18:31 2017 -0800 -- examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml | 2 +- frameworks/projects/FontAwesome/src/main/flex/FAClasses.as | 7 +++ 2 files changed, 4 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/36ca8acd/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml index 4c53118..107dbbd 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml @@ -30,7 +30,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/36ca8acd/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as index e5dcd47..495b61b 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as +++ b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as @@ -27,9 +27,8 @@ package */ internal class FAClasses { - import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; - import org.apache.flex.fa.FontAwesomeIconSize; FontAwesomeIconSize; - } - + import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; + import org.apache.flex.fa.FontAwesomeIconSize; FontAwesomeIconSize; + } }
[34/35] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/fontawesome
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/953730ec Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/953730ec Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/953730ec Branch: refs/heads/develop Commit: 953730ec98f3725e292638935d6bc662c5f17512 Parents: 1a4c534 d1b6c5d Author: OmPrakash Muppirala Authored: Mon Jan 9 23:54:47 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 23:54:47 2017 -0800 -- examples/examples-integrationtests/pom.xml | 139 .../flex/flexjs/examples/HelloWorldIT.java | 57 + .../MDLExample/src/main/flex/Buttons.mxml | 12 +- .../MDLExample/src/main/flex/MainFooter.mxml| 3 + .../src/main/flex/MainNavigation.mxml | 66 +++--- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 61 +- .../src/main/flex/models/MainNavigationModel.as | 76 +++ .../src/main/flex/vos/NavigationLinkVO.as | 34 +++ examples/pom.xml| 1 + .../flex/org/apache/flex/utils/DisplayUtils.as | 66 +- .../Express/src/main/flex/ExpressClasses.as | 1 + .../main/flex/org/apache/flex/express/List.as | 64 ++ .../src/main/resources/express-manifest.xml | 2 +- .../org/apache/flex/mdl/FooterSocialButton.as | 108 + .../main/flex/org/apache/flex/mdl/IconToggle.as | 218 +++ .../main/flex/org/apache/flex/mdl/Navigation.as | 11 +- .../src/main/flex/org/apache/flex/mdl/Switch.as | 22 +- .../src/main/flex/org/apache/flex/mdl/TabBar.as | 31 ++- .../flex/org/apache/flex/mdl/TabBarPanel.as | 1 + .../src/main/flex/org/apache/flex/mdl/Tabs.as | 31 ++- .../org/apache/flex/mdl/beads/ContactChip.as| 10 + .../apache/flex/mdl/beads/ContactImageChip.as | 10 + .../org/apache/flex/mdl/beads/DeletableChip.as | 2 + .../apache/flex/mdl/beads/DeletableLinkChip.as | 14 +- .../flex/org/apache/flex/mdl/beads/MdlColor.as | 21 +- .../org/apache/flex/mdl/beads/MdlTextColor.as | 32 ++- .../TabsItemRendererFactoryForArrayData.as | 10 + .../flex/mdl/beads/models/ISnackbarModel.as | 18 ++ .../apache/flex/mdl/beads/models/ITabModel.as | 14 +- .../apache/flex/mdl/beads/models/IToastModel.as | 41 .../flex/mdl/beads/models/SnackbarModel.as | 35 ++- .../apache/flex/mdl/beads/models/TabModel.as| 17 ++ .../apache/flex/mdl/beads/models/ToastModel.as | 45 +++- .../org/apache/flex/mdl/beads/views/ListView.as | 19 +- .../apache/flex/mdl/beads/views/TabBarView.as | 45 .../org/apache/flex/mdl/beads/views/TabsView.as | 41 +++- .../itemRenderers/NavigationLinkItemRenderer.as | 159 ++ .../TabBarButtonLayoutItemRenderer.as | 12 + .../TabBarButtonTabsItemRenderer.as | 11 + .../itemRenderers/TabBarLayoutItemRenderer.as | 10 + .../itemRenderers/TabBarPanelItemRenderer.as| 10 + .../mdl/materialIcons/MaterialIconFormatBold.as | 52 + .../materialIcons/MaterialIconFormatItalic.as | 52 + .../flex/mdl/materialIcons/MaterialIconsType.as | 3 + .../flex/mdl/supportClasses/ITabItemRenderer.as | 26 ++- .../flex/mdl/supportClasses/MaterialIconBase.as | 17 ++ .../TabBarButtonItemRendererBase.as | 8 + .../mdl/supportClasses/TabItemRendererBase.as | 26 ++- .../flex/mdl/supportClasses/TextFieldBase.as| 16 ++ .../src/main/resources/defaults.css | 10 + .../src/main/resources/mdl-manifest.xml | 6 +- 51 files changed, 1638 insertions(+), 158 deletions(-) --
[05/35] git commit: [flex-asjs] [refs/heads/develop] - First cut of FontAwesome library support.
First cut of FontAwesome library support. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/19adaeab Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/19adaeab Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/19adaeab Branch: refs/heads/develop Commit: 19adaeabf230fe594bd9606c5cbfdc994d7e6faf Parents: cac07e4 Author: OmPrakash Muppirala Authored: Tue Jan 3 02:22:06 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 3 02:22:06 2017 -0800 -- frameworks/projects/FontAwesome/build.xml | 116 frameworks/projects/FontAwesome/pom.xml | 138 +++ .../src/main/config/compile-as-config.xml | 87 .../FontAwesome/src/main/flex/FAClasses.as | 38 + .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 102 ++ .../FontAwesome/src/main/resources/defaults.css | 21 +++ .../src/main/resources/fa-as-manifest.xml | 24 .../src/main/resources/fa-manifest.xml | 24 frameworks/projects/pom.xml | 1 + 9 files changed, 551 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19adaeab/frameworks/projects/FontAwesome/build.xml -- diff --git a/frameworks/projects/FontAwesome/build.xml b/frameworks/projects/FontAwesome/build.xml new file mode 100644 index 000..de271c7 --- /dev/null +++ b/frameworks/projects/FontAwesome/build.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19adaeab/frameworks/projects/FontAwesome/pom.xml -- diff --git a/frameworks/projects/FontAwesome/pom.xml b/frameworks/projects/FontAwesome/pom.xml new file mode 100644 index 000..6e06992 --- /dev/null +++ b/frameworks/projects/FontAwesome/pom.xml @@ -0,0 +1,138 @@ + + +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";> + 4.0.0 + + +org.apache.flex.flexjs.framework +projects +0.8.0-SNAPSHOT + + + FontAwesome + 0.8.0-SNAPSHOT + swc + + Apache Flex - FlexJS: Framework: Libs: FontAwesome + + +src/main/flex + + +org.apache.flex.flexjs.compiler +flexjs-maven-plugin +${flexjs.compiler.version} +true + + + + library://ns.apache.org/flexjs/fa + ${project.basedir}/src/main/resources/fa-manifest.xml + + + as + library://ns.apache.org/flexjs/fa + ${project.basedir}/src/main/resources/fa-as-manifest.xml + + + +FAClasses + + + + defaults.css + ../src/main/resources/defaults.css + + + true + + + + + + + + org.apache.flex.flexjs.framework + Core + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework + Core + 0.8.0-SNAPSHOT + swc + typedefs + + + org.apache.flex.flexjs.framework + Binding + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework + Binding + 0.8.0-SNAPSHOT + swc + typedefs + + + org.apache.flex.flexjs.framework + Graphics + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework + Graphics + 0.8.0-SNAPSHOT + swc + typedefs + + + org.apache.flex.flexjs.framework + Collections + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework + Collections + 0.8.0-SNAPSHOT + swc + typedefs + + + org.apache.flex.flexjs.framework + HTML + 0.8.0-SNAPSHOT + swc + + + org.apache.flex
[09/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Fill TabBar in MainNavigation from Model
Fill TabBar in MainNavigation from Model Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c39324f2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c39324f2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c39324f2 Branch: refs/heads/feature/fontawesome Commit: c39324f28afbdae3d100f9c033d3840aa634c186 Parents: b873819 Author: piotrz Authored: Sat Jan 7 19:41:33 2017 +0100 Committer: piotrz Committed: Sat Jan 7 19:41:33 2017 +0100 -- .../src/main/flex/MainNavigation.mxml | 21 +++- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 51 .../src/main/flex/models/MainNavigationModel.as | 21 3 files changed, 28 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c39324f2/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 330fbed..28f587c 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -41,20 +41,13 @@ limitations under the License. - - - - - - - - - - - - - - + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c39324f2/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml b/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml index 170b469..52154e7 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml @@ -82,56 +82,5 @@ limitations under the License. - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c39324f2/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as -- diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as index c75b954..76a0807 100644 --- a/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as +++ b/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as @@ -51,5 +51,26 @@ package models { return _drawerNavigation; } + +private var _componentsTabs:Array = [ +new NavigationLinkVO("Cards", "cards_panel"), +new NavigationLinkVO("Chips", "chips_panel"), +new NavigationLinkVO("Sliders", "sliders_panel"), +new NavigationLinkVO("Grids", "grids_panel"), +new NavigationLinkVO("Tabs", "tabs_panel"), +new NavigationLinkVO("Buttons", "buttons_panel"), +new NavigationLinkVO("TextFields", "textfield_panel"), +new NavigationLinkVO("Snackbar", "snackbar_panel"), +new NavigationLinkVO("Toggles", "toggles_panel"), +new NavigationLinkVO("Lists", "lists_panel"), +new NavigationLinkVO("Loading", "loading_panel"), +new NavigationLinkVO("Menu", "menus_panel"), +new NavigationLinkVO("Badges", "badges_panel") +]; + +public function get componentsTabs():Array +{ +return _componentsTabs; +} } }
[10/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - - Expose from model selectedIndex in TabBar - in order to gives ability to select specified TabBarButton at start up - Update MDL exa
- Expose from model selectedIndex in TabBar - in order to gives ability to select specified TabBarButton at start up - Update MDL example with selectedIndex - Update docs Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/010e4c5d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/010e4c5d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/010e4c5d Branch: refs/heads/feature/fontawesome Commit: 010e4c5dad9591959b6209dae6ee6cf402347cdf Parents: c39324f Author: piotrz Authored: Sun Jan 8 01:03:58 2017 +0100 Committer: piotrz Committed: Sun Jan 8 01:03:58 2017 +0100 -- .../src/main/flex/MainNavigation.mxml | 2 +- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 4 +-- .../src/main/flex/org/apache/flex/mdl/TabBar.as | 31 - .../flex/org/apache/flex/mdl/beads/MdlColor.as | 5 +++ .../org/apache/flex/mdl/beads/MdlTextColor.as | 5 +++ .../org/apache/flex/mdl/beads/views/ListView.as | 11 +- .../apache/flex/mdl/beads/views/TabBarView.as | 36 7 files changed, 89 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/010e4c5d/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 28f587c..846ee63 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -41,7 +41,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/010e4c5d/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml b/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml index 52154e7..29e17fc 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml @@ -41,7 +41,7 @@ limitations under the License. - + - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/010e4c5d/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBar.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBar.as index 7914818..b2f7da5 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBar.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBar.as @@ -58,7 +58,15 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + +/** + * @copy org.apache.flex.core.IDataProviderModel#dataProvider + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function get dataProvider():Object { return ITabModel(model).dataProvider; @@ -68,6 +76,14 @@ package org.apache.flex.mdl ITabModel(model).dataProvider = value; } +/** + * @copy org.apache.flex.core.IDataProviderModel#labelField + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function get labelField():String { return ITabModel(model).labelField; @@ -77,6 +93,14 @@ package org.apache.flex.mdl ITabModel(model).labelField = value; } +/** + * @copy org.apache.flex.mdl.beads.models.ITabModel#tabIdField + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function get tabIdField():String { return ITabModel(model).tabIdField; @@ -87,6 +111,11 @@ package org.apache.flex.mdl ITabModel(model).tabIdField = value; } +public function
[16/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Added List to the Express framework; its dataProvider can be either Array or ArrayList and it will set up the correct beads to handle
Added List to the Express framework; its dataProvider can be either Array or ArrayList and it will set up the correct beads to handle it. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d1b6c5d2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d1b6c5d2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d1b6c5d2 Branch: refs/heads/feature/fontawesome Commit: d1b6c5d270820219573ec8218d49973dfe452164 Parents: ed7f71b Author: Peter Ent Authored: Mon Jan 9 14:23:51 2017 -0500 Committer: Peter Ent Committed: Mon Jan 9 14:23:51 2017 -0500 -- .../Express/src/main/flex/ExpressClasses.as | 1 + .../main/flex/org/apache/flex/express/List.as | 64 .../src/main/resources/express-manifest.xml | 2 +- 3 files changed, 66 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1b6c5d2/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 index 7c9da2a..70c74de 100644 --- a/frameworks/projects/Express/src/main/flex/ExpressClasses.as +++ b/frameworks/projects/Express/src/main/flex/ExpressClasses.as @@ -32,6 +32,7 @@ internal class ExpressClasses 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.List; List; import org.apache.flex.express.MXMLItemRenderer; MXMLItemRenderer; import org.apache.flex.express.TextInput; TextInput; import org.apache.flex.express.VContainer; VContainer; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1b6c5d2/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as -- diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as new file mode 100644 index 000..258ae77 --- /dev/null +++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as @@ -0,0 +1,64 @@ +package org.apache.flex.express +{ + import org.apache.flex.collections.ArrayList; + import org.apache.flex.core.IBead; + import org.apache.flex.events.Event; + import org.apache.flex.html.List; + import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; + import org.apache.flex.html.beads.DataItemRendererFactoryForArrayList; + import org.apache.flex.html.beads.models.ArrayListSelectionModel; + import org.apache.flex.html.beads.models.ArraySelectionModel; + + public class List extends org.apache.flex.html.List + { + public function List() + { + super(); + } + + override public function set dataProvider(value:Object):void + { + if (value is Array) { + // see if ArrayList beads are present and if so, remove them. + // see if Array beads are present and if not, add them. + + if (model != null) { + removeBead(model as IBead); + } + var newModel:ArraySelectionModel = new ArraySelectionModel(); + addBead(newModel); + + var oldFactory1:Object = getBeadByType(DataItemRendererFactoryForArrayList); + if (oldFactory1 != null) { + removeBead(oldFactory1 as IBead); + } + var newFactory1:DataItemRendererFactoryForArrayData = new DataItemRendererFactoryForArrayData(); + addBead(newFactory1); + } + else if (value is ArrayList) { + // see if Array beads are present and if so, remove them. + // see if ArrayList beads are present and if not, add them. + + if (model != null) { + removeBead(model as IBead); + } + var newListModel:ArrayListSelectionModel = new ArrayListSelectionModel(); +
[01/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - FooterSocialButton
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 1a4c53468 -> ffcc9a3dc FooterSocialButton Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/68928296 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/68928296 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/68928296 Branch: refs/heads/feature/fontawesome Commit: 689282967b579a5e9213b06ff39c407222433703 Parents: cf53944 Author: Carlos Rovira Authored: Sat Jan 7 01:34:02 2017 +0100 Committer: Carlos Rovira Committed: Sat Jan 7 01:34:02 2017 +0100 -- .../MDLExample/src/main/flex/MainFooter.mxml| 3 + .../org/apache/flex/mdl/FooterSocialButton.as | 108 +++ .../src/main/resources/mdl-manifest.xml | 1 + 3 files changed, 112 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/68928296/examples/flexjs/MDLExample/src/main/flex/MainFooter.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/MainFooter.mxml b/examples/flexjs/MDLExample/src/main/flex/MainFooter.mxml index 43b6c90..2b2b1f4 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainFooter.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainFooter.mxml @@ -40,5 +40,8 @@ limitations under the License. +1 +2 +3 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/68928296/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterSocialButton.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterSocialButton.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterSocialButton.as new file mode 100644 index 000..ff2a8d8 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterSocialButton.as @@ -0,0 +1,108 @@ + +// +// 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.html.TextButton; + import org.apache.flex.mdl.supportClasses.IFooterSection; + import org.apache.flex.core.UIBase; + +COMPILE::JS +{ +import org.apache.flex.core.WrappedHTMLElement; +} + + /** +* The FooterSocialButton 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 FooterSocialButton extends TextButton + { + /** +* constructor. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +*/ + public function FooterSocialButton() + { + 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__social-btn"; + +element = document.createElement('button') as WrappedHTMLElement; + +positioner = element; +element.flexjs_wrapper = this; + +return element; +} + + /** + * Configuration depends on parent Footer. +* Check t
[02/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - - Add missin doc to all models - Fix doc for MdlColor and MdlTextColor
- Add missin doc to all models - Fix doc for MdlColor and MdlTextColor Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8de13e8d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8de13e8d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8de13e8d Branch: refs/heads/feature/fontawesome Commit: 8de13e8d1b70ad07ccf90bad4f7e4aee795d7228 Parents: 6892829 Author: piotrz Authored: Sat Jan 7 02:19:16 2017 +0100 Committer: piotrz Committed: Sat Jan 7 02:19:16 2017 +0100 -- .../flex/org/apache/flex/mdl/beads/MdlColor.as | 14 +- .../org/apache/flex/mdl/beads/MdlTextColor.as | 20 + .../flex/mdl/beads/models/ISnackbarModel.as | 18 .../apache/flex/mdl/beads/models/ITabModel.as | 14 -- .../apache/flex/mdl/beads/models/IToastModel.as | 41 ++ .../flex/mdl/beads/models/SnackbarModel.as | 35 ++- .../apache/flex/mdl/beads/models/TabModel.as| 17 .../apache/flex/mdl/beads/models/ToastModel.as | 45 +++- 8 files changed, 189 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8de13e8d/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlColor.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlColor.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlColor.as index e39856d..8833c40 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlColor.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlColor.as @@ -55,7 +55,12 @@ package org.apache.flex.mdl.beads } /** - * @inheritDoc + * @copy org.apache.flex.mdl.supportClasses.IMdlColor#color + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 */ public function get color():String { @@ -68,7 +73,12 @@ package org.apache.flex.mdl.beads } /** - * @inheritDoc + * @copy org.apache.flex.mdl.supportClasses.IMdlColor#colorWeight + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 */ public function get colorWeight():String { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8de13e8d/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlTextColor.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlTextColor.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlTextColor.as index 58a2a91..6d6e85c 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlTextColor.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/MdlTextColor.as @@ -30,7 +30,12 @@ package org.apache.flex.mdl.beads private var _textColorWeight:String; /** - * @inheritDoc + * @copy org.apache.flex.mdl.supportClasses.IMdlTextColor#textColor + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 */ public function get textColor():String { @@ -43,7 +48,12 @@ package org.apache.flex.mdl.beads } /** - * @inheritDoc + * @copy org.apache.flex.mdl.supportClasses.IMdlTextColor#textColorWeight + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 */ public function get textColorWeight():String { @@ -79,9 +89,6 @@ package org.apache.flex.mdl.beads element.classList.toggle(elementColor, hasTextColor || hasTextColorWeight); } -/** - * @inheritDoc - */ public function get textColor():String { return _textColor; @@ -92,9 +99,6 @@ package org.apache.flex.mdl.beads _textColor = value; } -/** - * @inheritDoc - */ public function get textColorWeight():String { return _textColorWeight; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8de13e8d/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/ISnack
[05/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Update docs in several MDL components
Update docs in several MDL components Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5f2fd3aa Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5f2fd3aa Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5f2fd3aa Branch: refs/heads/feature/fontawesome Commit: 5f2fd3aa78b03ea4b47e4a86756e2b8767a5ce7f Parents: 6dc7747 Author: piotrz Authored: Sat Jan 7 13:25:25 2017 +0100 Committer: piotrz Committed: Sat Jan 7 13:25:25 2017 +0100 -- .../flex/org/apache/flex/mdl/beads/ContactChip.as | 10 ++ .../org/apache/flex/mdl/beads/ContactImageChip.as | 10 ++ .../flex/org/apache/flex/mdl/beads/DeletableChip.as | 2 ++ .../org/apache/flex/mdl/beads/DeletableLinkChip.as | 14 +- .../main/flex/org/apache/flex/mdl/beads/MdlColor.as | 2 ++ .../flex/org/apache/flex/mdl/beads/MdlTextColor.as | 7 +++ .../org/apache/flex/mdl/beads/views/ListView.as | 1 + .../apache/flex/mdl/supportClasses/TextFieldBase.as | 16 8 files changed, 61 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5f2fd3aa/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 84aa001..7450253 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 @@ -46,6 +46,16 @@ package org.apache.flex.mdl.beads } +/** + * The text displayed on ContactChip + * + * @param value + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function set contactText(value:String):void { _contactText = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5f2fd3aa/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 49ae1ec..ef2ce39 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 @@ -41,6 +41,16 @@ package org.apache.flex.mdl.beads } +/** + * Source for displayed image + * + * @param value + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function set source(value:String):void { _source = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5f2fd3aa/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as index 9f523c8..57bbc3b 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableChip.as @@ -52,6 +52,8 @@ package org.apache.flex.mdl.beads private var _strand:IStrand; /** + * @copy org.apache.flex.core.IBead#strand + * * @flexjsignorecoercion HTMLElement * @flexjsignorecoercion HTMLSpanElement * @flexjsignorecoercion HTMLButtonElement http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5f2fd3aa/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/DeletableLinkChip.as index 17e413c..923329b 100644 --- a/frameworks/projects/Ma
[08/18] flex-asjs git commit: Fix NavigationLink IR, but “hasOwnProperty” does not work :(
Fix NavigationLink IR, but âhasOwnPropertyâ does not work :( Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b8738194 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b8738194 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b8738194 Branch: refs/heads/feature/fontawesome Commit: b87381941445475677474aa99468fdc0e615de03 Parents: f80b3d4 Author: Carlos Rovira Authored: Sat Jan 7 18:22:07 2017 +0100 Committer: Carlos Rovira Committed: Sat Jan 7 18:22:07 2017 +0100 -- .../MDLExample/src/main/flex/MainNavigation.mxml | 14 -- .../mdl/itemRenderers/NavigationLinkItemRenderer.as | 12 +--- 2 files changed, 5 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8738194/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 ef59f71..330fbed 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -71,33 +71,19 @@ limitations under the License. - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8738194/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as index 0c1c5ae..87bfd65 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as @@ -112,17 +112,15 @@ package org.apache.flex.mdl.itemRenderers if(value == null) return; - /*if(value.hasOwnProperty('label')) { + if(value.label !== undefined) { label = String(value.label); } else { label = String(value); - }*/ - label = String(value.label); - -/*if(value.hasOwnProperty('href')) { + } + +if(value.href !== undefined) { href = String(value.href); - }*/ -href = String(value.href); + } COMPILE::JS {
[07/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Change Drawer Navigation Example to List
Change Drawer Navigation Example to List Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f80b3d4a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f80b3d4a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f80b3d4a Branch: refs/heads/feature/fontawesome Commit: f80b3d4a3698be386e5fbf004a1906e868542ebc Parents: 1550ee6 Author: Carlos Rovira Authored: Sat Jan 7 14:09:14 2017 +0100 Committer: Carlos Rovira Committed: Sat Jan 7 14:09:14 2017 +0100 -- .../MDLExample/src/main/flex/MainNavigation.mxml| 16 +++- .../src/main/flex/models/MainNavigationModel.as | 16 2 files changed, 23 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f80b3d4a/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 08b0bf9..ef59f71 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -61,15 +61,13 @@ limitations under the License. -https://getmdl.io/index.html"/> -https://getmdl.io/started/index.html"/> -https://getmdl.io/templates/index.html"/> -https://getmdl.io/components/index.html"/> -https://getmdl.io/styles/index.html"/> -https://getmdl.io/customize/index.html"/> -https://getmdl.io/showcase/index.html"/> -https://getmdl.io/faq/index.html"/> - + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f80b3d4a/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as -- diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as index 5e599ac..c75b954 100644 --- a/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as +++ b/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as @@ -35,5 +35,21 @@ package models { return _mainNavigation; } + +private var _drawerNavigation:Array = [ +new NavigationLinkVO("About", "https://getmdl.io/index.html";), +new NavigationLinkVO("Getting Started", "https://getmdl.io/started/index.html";), +new NavigationLinkVO("Templates", "https://getmdl.io/templates/index.html";), +new NavigationLinkVO("Components", "https://getmdl.io/components/index.html";), +new NavigationLinkVO("Styles", "https://getmdl.io/styles/index.html";), +new NavigationLinkVO("Customize", "https://getmdl.io/customize/index.html";), +new NavigationLinkVO("Showcase", "https://getmdl.io/showcase/index.html";), +new NavigationLinkVO("FAQ", "https://getmdl.io/faq/index.html";) +]; + +public function get drawerNavigation():Array +{ +return _drawerNavigation; +} } }
[12/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - - Expose from model selectedIndex in Tabs - in order to gives ability to select specified TabBarPanel at start up - Update MDL exampl
- Expose from model selectedIndex in Tabs - in order to gives ability to select specified TabBarPanel at start up - Update MDL example with selectedIndex Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/be86f911 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/be86f911 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/be86f911 Branch: refs/heads/feature/fontawesome Commit: be86f911bc72b30430263e4958e833128fe1fb12 Parents: a006bbe Author: piotrz Authored: Sun Jan 8 13:56:24 2017 +0100 Committer: piotrz Committed: Sun Jan 8 13:56:24 2017 +0100 -- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 6 ++-- .../src/main/flex/org/apache/flex/mdl/Tabs.as | 31 +++- .../org/apache/flex/mdl/beads/views/TabsView.as | 24 +-- 3 files changed, 55 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/be86f911/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml b/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml index 29e17fc..54058ce 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Tabs.mxml @@ -29,7 +29,7 @@ limitations under the License. - + - + @@ -64,7 +64,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/be86f911/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Tabs.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Tabs.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Tabs.as index a5d0a75..4f64e8d 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Tabs.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Tabs.as @@ -58,6 +58,14 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } +/** + * @copy org.apache.flex.core.IDataProviderModel#dataProvider + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function get dataProvider():Object { return ITabModel(model).dataProvider; @@ -66,7 +74,15 @@ package org.apache.flex.mdl { ITabModel(model).dataProvider = value; } - + +/** + * @copy org.apache.flex.mdl.beads.models.ITabModel#tabIdField + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function get tabIdField():String { return ITabModel(model).tabIdField; @@ -77,6 +93,14 @@ package org.apache.flex.mdl ITabModel(model).tabIdField = value; } +/** + * @copy org.apache.flex.core.IDataProviderModel#labelField + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function get labelField():String { return ITabModel(model).labelField; @@ -86,6 +110,11 @@ package org.apache.flex.mdl ITabModel(model).labelField = value; } +public function set selectedIndex(value:int):void +{ +ITabModel(model).selectedIndex = value; +} + public function getLayoutHost():ILayoutHost { return this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/be86f911/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as index 5619f28..4126569 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/
[03/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add missing doc to MDL views
Add missing doc to MDL views Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/da83830f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/da83830f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/da83830f Branch: refs/heads/feature/fontawesome Commit: da83830fceae98b2788600e54c4711d6bd8063b4 Parents: 8de13e8 Author: piotrz Authored: Sat Jan 7 02:26:04 2017 +0100 Committer: piotrz Committed: Sat Jan 7 02:26:04 2017 +0100 -- .../org/apache/flex/mdl/beads/views/ListView.as | 9 +++-- .../apache/flex/mdl/beads/views/TabBarView.as| 9 + .../org/apache/flex/mdl/beads/views/TabsView.as | 19 +++ 3 files changed, 35 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/da83830f/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 b642c18..38df18e 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 @@ -30,8 +30,13 @@ package org.apache.flex.mdl.beads.views import org.apache.flex.events.Event; /** -* ListView makes sure the itemRendererFactory and the layout beads are installed. -*/ +* ListView makes sure the itemRendererFactory and the layout beads are installed. +* + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public class ListView extends BeadViewBase implements IListView { public function ListView() http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/da83830f/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabBarView.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabBarView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabBarView.as index 0cde139..7049611 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabBarView.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabBarView.as @@ -18,6 +18,15 @@ package org.apache.flex.mdl.beads.views { +/** + * The TabBarView class creates the visual elements of the org.apache.flex.mdl.TabBar + * component. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public class TabBarView extends ListView { public function TabBarView() http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/da83830f/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as index e6ffaa6..5619f28 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/TabsView.as @@ -24,6 +24,15 @@ package org.apache.flex.mdl.beads.views import org.apache.flex.core.IStrand; import org.apache.flex.mdl.TabBar; +/** + * The TabsView class creates the visual elements of the org.apache.flex.mdl.Tabs + * component. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public class TabsView extends ListView { public function TabsView() @@ -33,6 +42,15 @@ package org.apache.flex.mdl.beads.views private var _tabBar:TabBar; +/** + * The org.apache.flex.mdl.TabBar component of the + * org.apache.flex.mdl.Tabs. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function get tabBar():TabBar
[13/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add IconToggle button - Add new material icons format_bold, format_italic - Update MDL Buttons example with new component
Add IconToggle button - Add new material icons format_bold, format_italic - Update MDL Buttons example with new 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/bed2b243 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bed2b243 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bed2b243 Branch: refs/heads/feature/fontawesome Commit: bed2b24377faf1cf38bd813b4987222ffa94a9f0 Parents: be86f91 Author: piotrz Authored: Sun Jan 8 18:23:30 2017 +0100 Committer: piotrz Committed: Sun Jan 8 18:23:30 2017 +0100 -- .../MDLExample/src/main/flex/Buttons.mxml | 12 +- .../main/flex/org/apache/flex/mdl/IconToggle.as | 218 +++ .../src/main/flex/org/apache/flex/mdl/Switch.as | 22 +- .../mdl/materialIcons/MaterialIconFormatBold.as | 52 + .../materialIcons/MaterialIconFormatItalic.as | 52 + .../flex/mdl/materialIcons/MaterialIconsType.as | 3 + .../flex/mdl/supportClasses/MaterialIconBase.as | 17 ++ .../src/main/resources/mdl-manifest.xml | 4 +- 8 files changed, 362 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bed2b243/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 a72ad48..ad20861 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml @@ -61,7 +61,17 @@ limitations under the License. - + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bed2b243/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/IconToggle.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/IconToggle.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/IconToggle.as new file mode 100644 index 000..bf5a994 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/IconToggle.as @@ -0,0 +1,218 @@ + +// +// 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.mdl.materialIcons.IMaterialIcon; +import org.apache.flex.mdl.supportClasses.MaterialIconBase; + +COMPILE::JS +{ +import org.apache.flex.core.UIBase; +import org.apache.flex.core.WrappedHTMLElement; +} +/** + * The IconToggle class provides a MDL UI-like appearance for + * a IconToggle. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +COMPILE::SWF +public class IconToggle implements IMaterialIcon +{ +/** + * Constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function IconToggle() {} + +private var _ripple:Boolean; +private var _dataMdlFor:String = "icon-toggle-1"; +private var _materialIcon:MaterialIconBase; + +/** + * The id value of the associated input + * Need to specify for display content of IconToggle + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public function get dataMdlFor():String +
[17/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Merge branch 'develop' into feature/fontawesome
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/953730ec Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/953730ec Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/953730ec Branch: refs/heads/feature/fontawesome Commit: 953730ec98f3725e292638935d6bc662c5f17512 Parents: 1a4c534 d1b6c5d Author: OmPrakash Muppirala Authored: Mon Jan 9 23:54:47 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 23:54:47 2017 -0800 -- examples/examples-integrationtests/pom.xml | 139 .../flex/flexjs/examples/HelloWorldIT.java | 57 + .../MDLExample/src/main/flex/Buttons.mxml | 12 +- .../MDLExample/src/main/flex/MainFooter.mxml| 3 + .../src/main/flex/MainNavigation.mxml | 66 +++--- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 61 +- .../src/main/flex/models/MainNavigationModel.as | 76 +++ .../src/main/flex/vos/NavigationLinkVO.as | 34 +++ examples/pom.xml| 1 + .../flex/org/apache/flex/utils/DisplayUtils.as | 66 +- .../Express/src/main/flex/ExpressClasses.as | 1 + .../main/flex/org/apache/flex/express/List.as | 64 ++ .../src/main/resources/express-manifest.xml | 2 +- .../org/apache/flex/mdl/FooterSocialButton.as | 108 + .../main/flex/org/apache/flex/mdl/IconToggle.as | 218 +++ .../main/flex/org/apache/flex/mdl/Navigation.as | 11 +- .../src/main/flex/org/apache/flex/mdl/Switch.as | 22 +- .../src/main/flex/org/apache/flex/mdl/TabBar.as | 31 ++- .../flex/org/apache/flex/mdl/TabBarPanel.as | 1 + .../src/main/flex/org/apache/flex/mdl/Tabs.as | 31 ++- .../org/apache/flex/mdl/beads/ContactChip.as| 10 + .../apache/flex/mdl/beads/ContactImageChip.as | 10 + .../org/apache/flex/mdl/beads/DeletableChip.as | 2 + .../apache/flex/mdl/beads/DeletableLinkChip.as | 14 +- .../flex/org/apache/flex/mdl/beads/MdlColor.as | 21 +- .../org/apache/flex/mdl/beads/MdlTextColor.as | 32 ++- .../TabsItemRendererFactoryForArrayData.as | 10 + .../flex/mdl/beads/models/ISnackbarModel.as | 18 ++ .../apache/flex/mdl/beads/models/ITabModel.as | 14 +- .../apache/flex/mdl/beads/models/IToastModel.as | 41 .../flex/mdl/beads/models/SnackbarModel.as | 35 ++- .../apache/flex/mdl/beads/models/TabModel.as| 17 ++ .../apache/flex/mdl/beads/models/ToastModel.as | 45 +++- .../org/apache/flex/mdl/beads/views/ListView.as | 19 +- .../apache/flex/mdl/beads/views/TabBarView.as | 45 .../org/apache/flex/mdl/beads/views/TabsView.as | 41 +++- .../itemRenderers/NavigationLinkItemRenderer.as | 159 ++ .../TabBarButtonLayoutItemRenderer.as | 12 + .../TabBarButtonTabsItemRenderer.as | 11 + .../itemRenderers/TabBarLayoutItemRenderer.as | 10 + .../itemRenderers/TabBarPanelItemRenderer.as| 10 + .../mdl/materialIcons/MaterialIconFormatBold.as | 52 + .../materialIcons/MaterialIconFormatItalic.as | 52 + .../flex/mdl/materialIcons/MaterialIconsType.as | 3 + .../flex/mdl/supportClasses/ITabItemRenderer.as | 26 ++- .../flex/mdl/supportClasses/MaterialIconBase.as | 17 ++ .../TabBarButtonItemRendererBase.as | 8 + .../mdl/supportClasses/TabItemRendererBase.as | 26 ++- .../flex/mdl/supportClasses/TextFieldBase.as| 16 ++ .../src/main/resources/defaults.css | 10 + .../src/main/resources/mdl-manifest.xml | 6 +- 51 files changed, 1638 insertions(+), 158 deletions(-) --
[11/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Take rotations into account, but Chrome and FF still seem to have a problem with getBoundingClientRect() for SVGs...
Take rotations into account, but Chrome and FF still seem to have a problem with getBoundingClientRect() for SVGs... Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a006bbe8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a006bbe8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a006bbe8 Branch: refs/heads/feature/fontawesome Commit: a006bbe894878ceda80df4939be43c0e9c510643 Parents: 010e4c5 Author: yishayw Authored: Sun Jan 8 14:15:05 2017 +0200 Committer: yishayw Committed: Sun Jan 8 14:15:05 2017 +0200 -- .../main/flex/org/apache/flex/utils/DisplayUtils.as | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a006bbe8/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as index ac66a19..4e08ffd 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as @@ -23,6 +23,7 @@ package org.apache.flex.utils COMPILE::JS { + import org.apache.flex.geom.Point; import org.apache.flex.geom.Matrix; import org.apache.flex.geom.Point; import org.apache.flex.core.ITransformHost; @@ -70,11 +71,17 @@ package org.apache.flex.utils var sm:SVGMatrix = svgElement.getScreenCTM(); var m:Matrix = new Matrix(sm.a,sm.b,sm.c,sm.d,sm.e,sm.f); var tl:Point = m.transformPoint(bounds.topLeft); + var tr:Point = m.transformPoint(new Point(bounds.right, bounds.top)); + var bl:Point = m.transformPoint(new Point(bounds.left, bounds.bottom)); var br:Point = m.transformPoint(bounds.bottomRight); - bounds.top = tl.y; - bounds.left = tl.x; - bounds.bottom = br.y; - bounds.right = br.x; + var leftX:Number = Math.min(tl.x, tr.x, bl.x, br.x); + var topY:Number = Math.min(tl.y, tr.y, bl.y, br.y); + var rightX:Number = Math.max(tl.x, tr.x, bl.x, br.x); + var bottomY:Number = Math.max(tl.y, tr.y, bl.y, br.y); + bounds.top = topY; + bounds.left = leftX; + bounds.bottom = bottomY; + bounds.right = rightX; } return bounds; }
[18/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add license header
Add license header Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ffcc9a3d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ffcc9a3d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ffcc9a3d Branch: refs/heads/feature/fontawesome Commit: ffcc9a3dc758ad1a670e4ad810e18994a124b60c Parents: 953730e Author: OmPrakash Muppirala Authored: Tue Jan 10 00:23:00 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 10 00:23:00 2017 -0800 -- .../src/main/flex/org/apache/flex/express/List.as | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ffcc9a3d/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as -- diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as index 258ae77..af4e97b 100644 --- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as +++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as @@ -1,3 +1,21 @@ + +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + package org.apache.flex.express { import org.apache.flex.collections.ArrayList;
[04/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add missing doc for MDL Tabs item renderers
Add missing doc for MDL Tabs item renderers Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6dc77471 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6dc77471 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6dc77471 Branch: refs/heads/feature/fontawesome Commit: 6dc77471e5d24fb90cf3e6e43f91680f7f1e4b91 Parents: da83830 Author: piotrz Authored: Sat Jan 7 13:10:33 2017 +0100 Committer: piotrz Committed: Sat Jan 7 13:10:33 2017 +0100 -- .../flex/org/apache/flex/mdl/TabBarPanel.as | 1 + .../TabsItemRendererFactoryForArrayData.as | 10 .../TabBarButtonLayoutItemRenderer.as | 12 + .../TabBarButtonTabsItemRenderer.as | 11 + .../itemRenderers/TabBarLayoutItemRenderer.as | 10 .../itemRenderers/TabBarPanelItemRenderer.as| 10 .../flex/mdl/supportClasses/ITabItemRenderer.as | 26 +++- .../TabBarButtonItemRendererBase.as | 8 ++ .../mdl/supportClasses/TabItemRendererBase.as | 26 +++- 9 files changed, 112 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6dc77471/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as index 9141eaf..98db21e 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as @@ -97,6 +97,7 @@ package org.apache.flex.mdl } private var _isActive:Boolean; + /** * Marks this Button as the active one in the TabBar * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6dc77471/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TabsItemRendererFactoryForArrayData.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TabsItemRendererFactoryForArrayData.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TabsItemRendererFactoryForArrayData.as index b898f17..f24674d 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TabsItemRendererFactoryForArrayData.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TabsItemRendererFactoryForArrayData.as @@ -37,6 +37,16 @@ package org.apache.flex.mdl.beads [Event(name="itemRendererCreated",type="org.apache.flex.events.ItemRendererEvent")] +/** + * The TabsItemRendererFactoryForArrayData class reads an + * array of data and creates an item renderer for every + * ITabItemRenderer in the array. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public class TabsItemRendererFactoryForArrayData extends EventDispatcher implements IBead, IDataProviderItemRendererMapper { public function TabsItemRendererFactoryForArrayData(target:Object = null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6dc77471/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/TabBarButtonLayoutItemRenderer.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/TabBarButtonLayoutItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/TabBarButtonLayoutItemRenderer.as index bea06e8..35ff154 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/TabBarButtonLayoutItemRenderer.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/TabBarButtonLayoutItemRenderer.as @@ -25,6 +25,18 @@ package org.apache.flex.mdl.itemRenderers import org.apache.flex.core.WrappedHTMLElement; } +/** + * Represents item renderer for TabBarButton + * + * Layout type item renderer + * + * Creates MDL "mdl-layout__tab" conponent + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * */ public class TabBarButtonLayoutItemRenderer extends TabBarButtonItemRendererBase { public func
[15/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - getBoundingClientRect() is unreliable, so add option to give original bounds as an argument.
getBoundingClientRect() is unreliable, so add option to give original bounds as an argument. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ed7f71b1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ed7f71b1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ed7f71b1 Branch: refs/heads/feature/fontawesome Commit: ed7f71b1f6ebc63073822fd1787f97d3dcb3ec1a Parents: 6913fa1 Author: yishayw Authored: Mon Jan 9 11:24:56 2017 +0200 Committer: yishayw Committed: Mon Jan 9 11:24:56 2017 +0200 -- .../flex/org/apache/flex/utils/DisplayUtils.as | 51 +--- 1 file changed, 44 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed7f71b1/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as index 4e08ffd..586b6da 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as @@ -18,13 +18,19 @@ package org.apache.flex.utils { + import org.apache.flex.core.IUIBase; + import org.apache.flex.geom.Matrix; import org.apache.flex.geom.Rectangle; + COMPILE::SWF + { + import flash.geom.Matrix; + } + COMPILE::JS { import org.apache.flex.geom.Point; - import org.apache.flex.geom.Matrix; import org.apache.flex.geom.Point; import org.apache.flex.core.ITransformHost; } @@ -52,7 +58,7 @@ package org.apache.flex.utils * @flexjsignorecoercion HTMLElement * @flexjsignorecoercion ITransformHost */ - public static function getScreenBoundingRect(obj:IUIBase):Rectangle + public static function getScreenBoundingRect(obj:IUIBase, boundsBeforeTransform:Rectangle=null):Rectangle { COMPILE::SWF { @@ -61,15 +67,17 @@ package org.apache.flex.utils COMPILE::JS { - var r:Object = (obj.element as HTMLElement).getBoundingClientRect(); - var bounds:Rectangle = new Rectangle(r.left, r.top, r.right - r.left, r.bottom - r.top); + var bounds:Rectangle = boundsBeforeTransform; + if (bounds == null) + { + var r:Object = (obj.element as HTMLElement).getBoundingClientRect(); + bounds = new Rectangle(r.left, r.top, r.right - r.left, r.bottom - r.top); + } bounds.x -= window.pageXOffset; bounds.y -= window.pageYOffset; if (obj.element instanceof SVGElement) { - var svgElement:Object = (obj as ITransformHost).transformElement as Object; - var sm:SVGMatrix = svgElement.getScreenCTM(); - var m:Matrix = new Matrix(sm.a,sm.b,sm.c,sm.d,sm.e,sm.f); + var m:org.apache.flex.geom.Matrix = getTransormMatrix(obj); var tl:Point = m.transformPoint(bounds.topLeft); var tr:Point = m.transformPoint(new Point(bounds.right, bounds.top)); var bl:Point = m.transformPoint(new Point(bounds.left, bounds.bottom)); @@ -86,6 +94,35 @@ package org.apache.flex.utils return bounds; } } + + /** +* Gets a composition all transform matrices applied to an IUIBase. Currently only works for SVG on JS side. +* +* @param obj The object to test. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +* @flexjsignorecoercion HTMLElement +* @flexjsignorecoercion ITransformHost +*/ + public static function getTransormMatrix
[14/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - - Added selenium webdriver integrationtests - Added a simple testcase to test the HelloWorld application as a template
- Added selenium webdriver integrationtests - Added a simple testcase to test the HelloWorld application as a template Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6913fa1c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6913fa1c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6913fa1c Branch: refs/heads/feature/fontawesome Commit: 6913fa1cdd9669961a87c847ddc67bea206b88b0 Parents: bed2b24 Author: Christofer Dutz Authored: Sun Jan 8 20:16:21 2017 +0100 Committer: Christofer Dutz Committed: Sun Jan 8 20:16:38 2017 +0100 -- examples/examples-integrationtests/pom.xml | 139 +++ .../flex/flexjs/examples/HelloWorldIT.java | 57 examples/pom.xml| 1 + 3 files changed, 197 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6913fa1c/examples/examples-integrationtests/pom.xml -- diff --git a/examples/examples-integrationtests/pom.xml b/examples/examples-integrationtests/pom.xml new file mode 100644 index 000..7553009 --- /dev/null +++ b/examples/examples-integrationtests/pom.xml @@ -0,0 +1,139 @@ + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples +0.8.0-SNAPSHOT + + + examples-integrationtests + 0.8.0-SNAPSHOT + jar + + Apache Flex - FlexJS: Examples: Integrationtests + + + + integrationtests + + + webdriver.gecko.driver + + + + + +org.apache.maven.plugins +maven-failsafe-plugin +2.19.1 + + + + integration-test + verify + + + + + + +org.codehaus.cargo +cargo-maven2-plugin +1.6.2 +true + + +start +pre-integration-test + + start + + + +stop +post-integration-test + + stop + + + + + +tomcat8x +${project.build.directory}/tomcat8x/container.log + + http://ftp.fau.de/apache/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.zip + ${java.io.tmpdir}/cargo/installs + + +18 + + +standalone +${project.build.directory}/tomcat8x/container + + 8082 + admin::manager + + + + + org.apache.flex.flexjs.examples + HelloWorld + war + + + + + + + + + + + + + org.apache.flex.flexjs.examples + HelloWorld + 0.8.0-SNAPSHOT + war + + + + + org.seleniumhq.selenium + selenium-firefox-driver + 3.0.1 + test + + + junit + junit + 4.10 + test + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6913fa1c/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java -- diff --git a/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java b/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java new file mode 100644 index 000..be43d25 --- /dev/null +++ b/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java @@ -0,0 +1,57 @@ +/* + * + * 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
[06/18] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Update Navigation and NavigationLink to List format. Update Main Navigation Example to the new list
Update Navigation and NavigationLink to List format. Update Main Navigation Example to the new list Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1550ee68 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1550ee68 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1550ee68 Branch: refs/heads/feature/fontawesome Commit: 1550ee6852d6795b84ad40cdd3f033f993adc296 Parents: 5f2fd3a Author: Carlos Rovira Authored: Sat Jan 7 13:45:33 2017 +0100 Committer: Carlos Rovira Committed: Sat Jan 7 13:45:33 2017 +0100 -- .../src/main/flex/MainNavigation.mxml | 15 +- .../src/main/flex/models/MainNavigationModel.as | 39 + .../src/main/flex/vos/NavigationLinkVO.as | 34 .../main/flex/org/apache/flex/mdl/Navigation.as | 11 +- .../itemRenderers/NavigationLinkItemRenderer.as | 161 +++ .../src/main/resources/defaults.css | 10 ++ .../src/main/resources/mdl-manifest.xml | 1 + 7 files changed, 259 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1550ee68/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 bb6f43b..08b0bf9 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -23,15 +23,22 @@ limitations under the License. xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns="http://www.w3.org/1999/xhtml"; xmlns:models="models.*" fixedHeader="true"> + + + + + -https://getmdl.io/index.html"/> -https://getmdl.io/started/index.html"/> -https://getmdl.io/components/index.html"/> -https://getmdl.io/customize/index.html"/> + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1550ee68/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as -- diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as new file mode 100644 index 000..5e599ac --- /dev/null +++ b/examples/flexjs/MDLExample/src/main/flex/models/MainNavigationModel.as @@ -0,0 +1,39 @@ + +// +// 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 vos.NavigationLinkVO; + +public class MainNavigationModel extends EventDispatcher +{ +private var _mainNavigation:Array = [ +new NavigationLinkVO("About", "https://getmdl.io/index.html";), +new NavigationLinkVO("Getting Started", "https://getmdl.io/started/index.html";), +new NavigationLinkVO("Components", "https://getmdl.io/components/index.html";), +new NavigationLinkVO("Customize", "https://getmdl.io/customize/index.html";) +]; + +public function get mainNavigation():Array +{ +return _mainNavigation; +} +} +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1550ee68/examples/flexjs/MDLExample/src/main/flex/vos/NavigationLinkVO.as -- diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/NavigationLinkVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/NavigationLinkVO.as new file mode 10064
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Clean up
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome d5120ff7e -> 1a4c53468 Clean up Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1a4c5346 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1a4c5346 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1a4c5346 Branch: refs/heads/feature/fontawesome Commit: 1a4c534681ab13179e1bfc4b618f639bc811d93a Parents: d5120ff Author: OmPrakash Muppirala Authored: Mon Jan 9 01:22:09 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 01:22:09 2017 -0800 -- .../src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 4 ++-- .../src/main/flex/org/apache/flex/fa/beads/Animate.as| 1 - 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a4c5346/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 04b5715..d171573 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 @@ -180,7 +180,7 @@ package org.apache.flex.fa return _showBorder; } -public function set showBorder(value:Boolean) +public function set showBorder(value:Boolean):void { _showBorder = value; COMPILE::JS @@ -203,7 +203,7 @@ package org.apache.flex.fa return _rotation; } -public function set rotation(value:String) +public function set rotation(value:String):void { COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1a4c5346/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as index 4185b0f..e22501c 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as @@ -20,7 +20,6 @@ package org.apache.flex.fa.beads { import org.apache.flex.core.IBead; import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; -import org.osmf.elements.HTMLElement; public class Animate implements IBead { /**
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add support for rotation in FontAwesomeIcon
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 5c227d430 -> d5120ff7e Add support for rotation in FontAwesomeIcon Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d5120ff7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d5120ff7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d5120ff7 Branch: refs/heads/feature/fontawesome Commit: d5120ff7e63aa909e2282fcebef501610ae2b655 Parents: 5c227d4 Author: OmPrakash Muppirala Authored: Mon Jan 9 00:32:37 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 00:32:37 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml | 3 +- .../FontAwesome/src/main/flex/FAClasses.as | 1 + .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 30 .../apache/flex/fa/FontAwesomeIconRotation.as | 27 ++ 4 files changed, 60 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d5120ff7/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index 3d47333..ddd0a89 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -26,6 +26,7 @@ limitations under the License.
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add Animate bead for FontAwesomeIcon
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome b7a3da36c -> 5c227d430 Add Animate bead for FontAwesomeIcon Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5c227d43 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5c227d43 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5c227d43 Branch: refs/heads/feature/fontawesome Commit: 5c227d4302f123c023e0f073caf4438d7c89f36f Parents: b7a3da3 Author: OmPrakash Muppirala Authored: Mon Jan 9 00:13:53 2017 -0800 Committer: OmPrakash Muppirala Committed: Mon Jan 9 00:13:53 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml | 25 +- .../flex/org/apache/flex/fa/beads/Animate.as| 95 .../src/main/resources/fa-manifest.xml | 1 + 3 files changed, 118 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c227d43/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index d32fc78..3d47333 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -80,11 +80,30 @@ limitations under the License. +showBorder="true"> + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c227d43/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as new file mode 100644 index 000..4185b0f --- /dev/null +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/beads/Animate.as @@ -0,0 +1,95 @@ + +// +// 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.fa.beads { +import org.apache.flex.core.IBead; +import org.apache.flex.core.IStrand; +import org.apache.flex.core.UIBase; +import org.osmf.elements.HTMLElement; + +public class Animate implements IBead { +/** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public function Animate() { +} + +private var _strand:IStrand; +private var _spin:Boolean = true; +private var _pulse:Boolean = false; + +/** + * Rotate the icon + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public function get spin():Boolean +{ +return _spin; +} + +public function set spin(value:Boolean):void +{ +_spin = value; +} +/** + * Pulse the icon, i.e. rotate with 8 steps + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +public function get pulse():Bool
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Fix ASDoc as per code review
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 62beb260e -> b7a3da36c Fix ASDoc as per code review Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b7a3da36 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b7a3da36 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b7a3da36 Branch: refs/heads/feature/fontawesome Commit: b7a3da36c2e6d8f43819b498c8c5fc9907557735 Parents: 62beb26 Author: OmPrakash Muppirala Authored: Sun Jan 8 23:07:37 2017 -0800 Committer: OmPrakash Muppirala Committed: Sun Jan 8 23:07:37 2017 -0800 -- .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 30 1 file changed, 24 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b7a3da36/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 a2a8ed1..9a1022b 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 @@ -110,8 +110,13 @@ package org.apache.flex.fa } /** - * To increase icon sizes relative to their container, - * use the X1 (33% increase), X2, X3, X4, or X5. + * To increase icon sizes relative to their container, + * use the X1 (33% increase), X2, X3, X4, or X5. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 * */ public function get size():String @@ -135,9 +140,16 @@ package org.apache.flex.fa } /** - * Set icons at a fixed width. - * Great to use when different icon widths throw off alignment. - * Especially useful in things like nav lists & list groups. + * + * Set icons at a fixed width. + * Great to use when different icon widths throw off alignment. + * Especially useful in things like nav lists & list groups. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * */ public function get fixedWidth():Boolean { @@ -154,7 +166,13 @@ package org.apache.flex.fa } /** - * Show a border around the icon + * Show a border around the icon + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + * */ public function get showBorder():Boolean {
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add support for border
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 4d34b4820 -> 62beb260e Add support for border Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/62beb260 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/62beb260 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/62beb260 Branch: refs/heads/feature/fontawesome Commit: 62beb260e3c64b0cc7f6afa123c3cddca96484ed Parents: 4d34b48 Author: OmPrakash Muppirala Authored: Sun Jan 8 00:17:51 2017 -0800 Committer: OmPrakash Muppirala Committed: Sun Jan 8 00:17:51 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml| 7 --- .../flex/org/apache/flex/fa/FontAwesomeIcon.as| 18 ++ 2 files changed, 22 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/62beb260/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index 09484b2..d32fc78 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -79,12 +79,13 @@ limitations under the License. - + - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/62beb260/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 62f3189..a2a8ed1 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 @@ -64,6 +64,7 @@ package org.apache.flex.fa protected var _iconType:String; protected var _size:String; protected var _fixedWidth:Boolean; +protected var _showBorder:Boolean; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -151,6 +152,23 @@ package org.apache.flex.fa element.classList.toggle('fa-fw',_fixedWidth); } } + +/** + * Show a border around the icon + */ +public function get showBorder():Boolean +{ +return _showBorder; +} + +public function set showBorder(value:Boolean) +{ +_showBorder = value; +COMPILE::JS +{ +element.classList.toggle('fa-border',_showBorder) +} +} } }
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add some comments
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 7c793d55b -> 4d34b4820 Add some comments Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4d34b482 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4d34b482 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4d34b482 Branch: refs/heads/feature/fontawesome Commit: 4d34b48204742acce678c602df764de73214d2a7 Parents: 7c793d5 Author: OmPrakash Muppirala Authored: Sat Jan 7 23:20:13 2017 -0800 Committer: OmPrakash Muppirala Committed: Sat Jan 7 23:20:13 2017 -0800 -- .../main/flex/itemRenderers/MemberItemRenderer.mxml| 2 +- .../main/flex/org/apache/flex/fa/FontAwesomeIcon.as| 13 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d34b482/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index 4456822..09484b2 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -74,7 +74,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4d34b482/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 b25cea2..62f3189 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 @@ -107,8 +107,12 @@ package org.apache.flex.fa element.classList.add(_iconType); } } - - + +/** + * To increase icon sizes relative to their container, + * use the X1 (33% increase), X2, X3, X4, or X5. + * + */ public function get size():String { return _size; @@ -129,6 +133,11 @@ package org.apache.flex.fa } } +/** + * Set icons at a fixed width. + * Great to use when different icon widths throw off alignment. + * Especially useful in things like nav lists & list groups. + */ public function get fixedWidth():Boolean { return _fixedWidth;
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add support for fixed-width icons (fa-fw)
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 404e55e4c -> 7c793d55b Add support for fixed-width icons (fa-fw) Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7c793d55 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7c793d55 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7c793d55 Branch: refs/heads/feature/fontawesome Commit: 7c793d55bdb53f121d1069bbb3c100721e23d005 Parents: 404e55e Author: OmPrakash Muppirala Authored: Sat Jan 7 23:14:21 2017 -0800 Committer: OmPrakash Muppirala Committed: Sat Jan 7 23:14:21 2017 -0800 -- .../main/flex/itemRenderers/MemberItemRenderer.mxml | 3 ++- .../main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 15 +++ 2 files changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7c793d55/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index ab1ff19..4456822 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -79,7 +79,8 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7c793d55/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 e193b0d..b25cea2 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 @@ -63,6 +63,7 @@ package org.apache.flex.fa protected var textNode:Text; protected var _iconType:String; protected var _size:String; +protected var _fixedWidth:Boolean; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -127,6 +128,20 @@ package org.apache.flex.fa element.classList.add(value); } } + +public function get fixedWidth():Boolean +{ +return _fixedWidth; +} + +public function set fixedWidth(value:Boolean):void +{ +_fixedWidth = value; +COMPILE::JS +{ +element.classList.toggle('fa-fw',_fixedWidth); +} +} } }
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Fix ant build so it builds fontawesome library as well.
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 633ed1062 -> 799969936 Fix ant build so it builds fontawesome library as well. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/79996993 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/79996993 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/79996993 Branch: refs/heads/feature/fontawesome Commit: 7999699363e157e6cd9cadc9642067176d07dbfe Parents: 633ed10 Author: OmPrakash Muppirala Authored: Wed Jan 4 16:54:47 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 16:54:47 2017 -0800 -- frameworks/build.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79996993/frameworks/build.xml -- diff --git a/frameworks/build.xml b/frameworks/build.xml index a4087eb..638ccb1 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -98,6 +98,7 @@ +
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add the inject_html directive to the constructor asdoc comment instead of the class's asdoc comments
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome a20d30ac6 -> 633ed1062 Add the inject_html directive to the constructor asdoc comment instead of the class's asdoc comments Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/633ed106 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/633ed106 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/633ed106 Branch: refs/heads/feature/fontawesome Commit: 633ed10620c22fb1f982481be59d1abed20f6043 Parents: a20d30a Author: OmPrakash Muppirala Authored: Wed Jan 4 12:06:02 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 12:06:02 2017 -0800 -- .../src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/633ed106/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 05b5ec4..e193b0d 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 @@ -35,9 +35,6 @@ package org.apache.flex.fa * @playerversion AIR 2.6 * @productversion FlexJS 0.0 * -* -* http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> -* * */ public class FontAwesomeIcon extends UIBase @@ -51,6 +48,9 @@ package org.apache.flex.fa * @productversion FlexJS 0.0 * * @flexjsignorecoercion HTMLElement +* +* http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> +* */ public function FontAwesomeIcon() {
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Attempt to move the font awesome css file to the library itself, instead of in the end app project
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome 36ca8acd4 -> a20d30ac6 Attempt to move the font awesome css file to the library itself, instead of in the end app 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/a20d30ac Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a20d30ac Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a20d30ac Branch: refs/heads/feature/fontawesome Commit: a20d30ac603ebc385a9acb593988714f996d50ec Parents: 36ca8ac Author: OmPrakash Muppirala Authored: Wed Jan 4 02:45:07 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:45:07 2017 -0800 -- .../src/main/resources/mdl-js-index-template.html | 1 - .../src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 5 + 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a20d30ac/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html index 5999f04..62cbf70 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html @@ -24,7 +24,6 @@ https://fonts.googleapis.com/icon?family=Material+Icons";> https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css";> - http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> https://code.getmdl.io/1.2.1/material.min.js";> ${head} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a20d30ac/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 7c86c75..05b5ec4 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 @@ -34,6 +34,11 @@ package org.apache.flex.fa * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 +* +* +* http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> +* +* */ public class FontAwesomeIcon extends UIBase {
[4/4] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Fix code formatting
Fix code formatting Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/36ca8acd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/36ca8acd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/36ca8acd Branch: refs/heads/feature/fontawesome Commit: 36ca8acd4df84044c998091f1f1fd535f4b74858 Parents: 79b255c Author: OmPrakash Muppirala Authored: Wed Jan 4 02:18:31 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:18:31 2017 -0800 -- examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml | 2 +- frameworks/projects/FontAwesome/src/main/flex/FAClasses.as | 7 +++ 2 files changed, 4 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/36ca8acd/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml index 4c53118..107dbbd 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/MainView.mxml @@ -30,7 +30,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/36ca8acd/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as index e5dcd47..495b61b 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as +++ b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as @@ -27,9 +27,8 @@ package */ internal class FAClasses { - import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; - import org.apache.flex.fa.FontAwesomeIconSize; FontAwesomeIconSize; - } - + import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; + import org.apache.flex.fa.FontAwesomeIconSize; FontAwesomeIconSize; + } }
[1/4] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Use FontAwesomeIcon instead of I element in example
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome c3332d830 -> 36ca8acd4 Use FontAwesomeIcon instead of I element 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/09d57a3c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/09d57a3c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/09d57a3c Branch: refs/heads/feature/fontawesome Commit: 09d57a3c9ff6943b17f9a3472291635508ff195c Parents: c3332d8 Author: OmPrakash Muppirala Authored: Wed Jan 4 02:11:00 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:15:30 2017 -0800 -- .../flex/itemRenderers/MemberItemRenderer.mxml | 15 ++ .../org/apache/flex/fa/FontAwesomeIconSize.as | 29 2 files changed, 38 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/09d57a3c/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index b479aa5..7edae67 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -58,26 +58,29 @@ limitations under the License. - + - + - + - + + + + + + - - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/09d57a3c/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as new file mode 100644 index 000..57dff52 --- /dev/null +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIconSize.as @@ -0,0 +1,29 @@ + +// +// 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.fa +{ +public class FontAwesomeIconSize +{ + public static const X1:String = 'fa-lg'; + public static const X2:String = 'fa-2x'; + public static const X3:String = 'fa-3x'; + public static const X4:String = 'fa-4x'; + public static const X5:String = 'fa-5x'; +} +}
[3/4] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add support for 'size' functionality
Add support for 'size' 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/79b255c1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/79b255c1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/79b255c1 Branch: refs/heads/feature/fontawesome Commit: 79b255c10d4a05aa77b5982c7fa1938e6f5121ea Parents: b4ff819 Author: OmPrakash Muppirala Authored: Wed Jan 4 02:13:27 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:16:18 2017 -0800 -- .../FontAwesome/src/main/flex/FAClasses.as | 5 ++-- .../flex/org/apache/flex/fa/FontAwesomeIcon.as | 28 +--- 2 files changed, 28 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79b255c1/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as index e231687..e5dcd47 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as +++ b/frameworks/projects/FontAwesome/src/main/flex/FAClasses.as @@ -27,8 +27,9 @@ package */ internal class FAClasses { - import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; - } + import org.apache.flex.fa.FontAwesomeIconType; FontAwesomeIconType; + import org.apache.flex.fa.FontAwesomeIconSize; FontAwesomeIconSize; + } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79b255c1/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 a734fde..7c86c75 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 @@ -57,6 +57,7 @@ package org.apache.flex.fa COMPILE::JS protected var textNode:Text; protected var _iconType:String; + protected var _size:String; /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement @@ -86,20 +87,41 @@ package org.apache.flex.fa return _iconType; } - public function set iconType(v:String):void + public function set iconType(value:String):void { COMPILE::JS { -element.classList.remove(v); +element.classList.remove(value); } -_iconType = v; +_iconType = value; COMPILE::JS { element.classList.add(_iconType); } } + + +public function get size():String +{ +return _size; +} + + public function set size(value:String):void +{ +COMPILE::JS +{ +element.classList.remove(value); +} + +_size = value; +COMPILE::JS +{ +element.classList.add(value); +} +} + } }
[2/4] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Upgrade to latest verions (4.7) of FontAwesome icons
Upgrade to latest verions (4.7) of FontAwesome icons Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b4ff8198 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b4ff8198 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b4ff8198 Branch: refs/heads/feature/fontawesome Commit: b4ff8198387839f479dd6b2fdd0832c1c2716e9c Parents: 09d57a3 Author: OmPrakash Muppirala Authored: Wed Jan 4 02:11:32 2017 -0800 Committer: OmPrakash Muppirala Committed: Wed Jan 4 02:15:31 2017 -0800 -- .../FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4ff8198/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html index d329f95..5999f04 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html @@ -24,7 +24,7 @@ https://fonts.googleapis.com/icon?family=Material+Icons";> https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css";> - http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css";> + http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> https://code.getmdl.io/1.2.1/material.min.js";> ${head}
git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Try using fontawesome icon component in fexlteampage_mdl example project
Repository: flex-asjs Updated Branches: refs/heads/feature/fontawesome e17a8ff3c -> 413902c83 Try using fontawesome icon component in fexlteampage_mdl example 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/413902c8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/413902c8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/413902c8 Branch: refs/heads/feature/fontawesome Commit: 413902c8390fed988495c83909de4cd6175f9f08 Parents: e17a8ff Author: OmPrakash Muppirala Authored: Tue Jan 3 23:37:35 2017 -0800 Committer: OmPrakash Muppirala Committed: Tue Jan 3 23:37:35 2017 -0800 -- .../src/main/flex/itemRenderers/MemberItemRenderer.mxml| 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/413902c8/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index da4a07c..b479aa5 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -22,10 +22,12 @@ limitations under the License. xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:fa="library://ns.apache.org/flexjs/fa" xmlns="http://www.w3.org/1999/xhtml"; - xmlns:components="components.*" > + >
[04/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - MDL Slider event change working
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 Authored: Wed Dec 28 18:40:22 2016 +0100 Committer: Carlos Rovira 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_
[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
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 Authored: Wed Dec 28 19:48:13 2016 +0100 Committer: Carlos Rovira 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";> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ 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. ]]> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + + + + + + 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/
[20/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Make one of the element disabled in menu and add divider
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 Authored: Mon Jan 2 08:45:09 2017 +0100 Committer: piotrz 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. --> http://ns.adobe.com/mxml/2009"; - xmlns:mdl="library://ns.apache.org/flexjs/mdl"> - +
[13/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - TextArea maxrows and disabled textfield example
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 Authored: Sun Jan 1 19:37:58 2017 +0100 Committer: Carlos Rovira 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. + + + + + + + + @@ -66,9 +74,9 @@ limitations under the License. - + - + 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
[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
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 Authored: Tue Jan 3 19:39:23 2017 +0100 Committer: Carlos Rovira Committed: Tue Jan 3 19:39:23 2017 +0100 -- examples/flexjs/MDLExample/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[35/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Initial set of classes for Express project.
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 Authored: Tue Jan 3 15:23:32 2017 -0500 Committer: Peter Ent 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 000..49ce823 --- /dev/null +++ b/frameworks/js/FlexJS/projects/ExpressJS/build.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + +target.name.nojs=${ant.project.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 000..26db1d9 --- /dev/null +++ b/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml @@ -0,0 +1,92 @@ + + + + +false + + + true + + org.apache.flex.events.ValueChangeEvent + org.apache.flex.events.ValueChangeEvent + valueChange + + +COMPILE::SWF +false + + +COMPILE::JS +true + + + + Bindable + Managed + ChangeEvent + NonCommittingChangeEvent + Transient + + + + + + + ../../../../../../../../js/libs/GCL.swc + +../../../../../libs/BindingJS.swc +../../../../../libs/CoreJS.swc +../../../../../libs/GraphicsJS.swc +../../../../../libs/CollectionsJS.swc +../../../../../libs/HTMLJS.swc + + + + +library://ns.apache.org/flexjs/express + ../../../../../../../projects/Express/src/main/resources/express-manifest.xml + + + + + ../../../../../../../projects/Express/src/main/flex + + +false + + + +
[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 - A
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 Authored: Sun Jan 1 21:33:57 2017 +0100 Committer: piotrz 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"> + + + + @@ -120,16 +124,14 @@ limitations under the License. - - - - - - - - - - + + + + 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 000..25b55ca --- /dev/null +++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml @@ -0,0 +1,66 @@ + + +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)"> + + + + + + + + + + + + + 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 000..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
[24/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Remove warnings related to Bindings - Make MenuItemVO Bindable
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 Authored: Mon Jan 2 09:39:48 2017 +0100 Committer: piotrz 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. - + 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;
[25/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Update MDL to version 1.3.0
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 Authored: Mon Jan 2 18:52:09 2017 +0100 Committer: piotrz 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 @@ https://fonts.googleapis.com/icon?family=Material+Icons";> - https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css";> - https://code.getmdl.io/1.2.1/material.min.js";> + https://code.getmdl.io/1.3.0/material.${primary}-${accent}.min.css";> + https://code.getmdl.io/1.3.0/material.min.js";> ${head}
[28/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Fix Binding for MDL Menu - make Bindable each property in MenuItemVO
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 Authored: Tue Jan 3 13:37:03 2017 +0100 Committer: piotrz 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. --> 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.*"> @@ -28,7 +27,7 @@ limitations under the License.
[23/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add separate Tab for Menu - move menu from Others Tab
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 Authored: Mon Jan 2 09:33:05 2017 +0100 Committer: piotrz 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"> - - - - @@ -50,6 +46,7 @@ limitations under the License. + @@ -92,6 +89,8 @@ limitations under the License. + + @@ -117,23 +116,6 @@ limitations under the License. - - - - - - - - - - - - - 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 000..50e9735 --- /dev/null +++ b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml @@ -0,0 +1,45 @@ + + +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.*"> + + + + + + + + + + + + + + + + + +
[19/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Remove parts related to sub menus
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 Authored: Mon Jan 2 08:32:08 2017 +0100 Committer: piotrz 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. --> 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)"> - - - - + xmlns:mdl="library://ns.apache.org/flexjs/mdl"> + - - - - - 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/Me
[32/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - fix up ant build
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 Authored: Tue Jan 3 10:38:02 2017 -0800 Committer: Alex Harui 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 @@ - +
[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 Authored: Wed Dec 28 02:17:02 2016 +0100 Committer: Carlos Rovira 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,
[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 i
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 Authored: Sun Jan 1 18:48:20 2017 +0100 Committer: Carlos Rovira 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";> - + - + + - - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + \ 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 000..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;
[38/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Set textContent to empty string, otherwise it will show up as 'undefined'
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 Authored: Tue Jan 3 18:18:34 2017 -0800 Committer: OmPrakash Muppirala 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;
[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 obj
- 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 Authored: Wed Dec 28 15:03:10 2016 +0100 Committer: piotrz 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"> - - + + + + + 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.ap
[15/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Refactor to TextFieldBase to remove duplicated code and better management of common functionality
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 Authored: Sun Jan 1 20:08:46 2017 +0100 Committer: Carlos Rovira 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. - + - - + 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")); - } - } - -privat
[27/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Fix Slider change event causing stack overflow
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 Authored: Tue Jan 3 12:29:00 2017 +0100 Committer: Carlos Rovira 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 } /**
[26/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add ItemRendererDataBinding to CustomMenuItemRenderer - make getter menuItem working, but binding is still not fixed.
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 Authored: Tue Jan 3 08:35:15 2017 +0100 Committer: piotrz 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. --> http://ns.adobe.com/mxml/2009"; xmlns:mdl="library://ns.apache.org/flexjs/mdl" + xmlns:binding="org.apache.flex.binding.*" divider="{menuItem.hasDivider}"> + 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; -} +} */ } }
[09/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - - Clean up unused imports - Rename TBody to THead - Change className assignment to classList.toggle
- 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 Authored: Thu Dec 29 20:04:00 2016 +0100 Committer: piotrz 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..000 --- 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 -* @player
[10/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Added MDL Slider input event and rename valueChange in favor of change
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 Authored: Sat Dec 31 09:41:23 2016 +0100 Committer: Carlos Rovira 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. - + @@ -65,7 +65,7 @@ limitations under the License. - + 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
[31/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Add divider in MDL CustomMenuItemRenderer
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 Authored: Tue Jan 3 14:14:03 2017 +0100 Committer: piotrz 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. --> 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}">
[03/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - - Extend SnackbarModel by ToastModel - Fix UI in example
- 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 Authored: Wed Dec 28 15:30:13 2016 +0100 Committer: piotrz 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. http://ns.adobe.com/mxml/2009"; xmlns:mdl="library://ns.apache.org/flexjs/mdl"> - + +text="Show Toast!" width="180" accent="true" colored="true" raised="true"/> - + +text="Show Snackbar!" width="180" accent="true" colored="true" raised="true"/> 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; -
[11/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - MDL Search-Expandable bead for TextField MDL control
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 Authored: Sat Dec 31 17:40:12 2016 +0100 Committer: Carlos Rovira 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. + + + + + + + + + + + + + + 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 000..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. +// +
[07/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Dispatch event through the strand for Snackbar component
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 Authored: Thu Dec 29 11:24:47 2016 +0100 Committer: piotrz 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")); } } }
[08/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Remove warrnings related to wrong namespaces in MDL example
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 Authored: Thu Dec 29 19:11:52 2016 +0100 Committer: piotrz 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. - + - + @@ -70,11 +70,11 @@ limitations under the License. - + - + 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. - + - + 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. --> 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. - + - + - + - + - + - + - +
[33/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Remove css prefixing whitespaces in UIBase when value is empty
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 Authored: Tue Jan 3 19:38:48 2017 +0100 Committer: Carlos Rovira 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"));
[18/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Mdl icon arrow down
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 Authored: Mon Jan 2 01:34:08 2017 +0100 Committer: Carlos Rovira 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. - + - + @@ -35,16 +35,22 @@ limitations under the License. + + + + + + - + - + 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 000..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/MaterialIconsTyp
[21/38] git commit: [flex-asjs] [refs/heads/feature/fontawesome] - Use CustomMenuItemRenderer in example
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 Authored: Mon Jan 2 08:50:37 2017 +0100 Committer: piotrz 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. https://getmdl.io/styles/index.html"/> https://getmdl.io/customize/index.html"/> https://getmdl.io/showcase/index.html"/> -https://getmdl.io/faq/index.html"/> + https://getmdl.io/faq/index.html"/> @@ -125,7 +125,7 @@ limitations under the License. + labelField="label" className="customMenuItemRenderer"> 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"); }