Repository: flex-asjs Updated Branches: refs/heads/develop 3c600227e -> a84c987f6
Updated TeamPage example to use new HorizontalFlowLayout. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a84c987f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a84c987f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a84c987f Branch: refs/heads/develop Commit: a84c987f691938ce50b1be5e4324799773506a38 Parents: 3c60022 Author: Peter Ent <p...@apache.org> Authored: Thu Dec 1 11:44:12 2016 -0500 Committer: Peter Ent <p...@apache.org> Committed: Thu Dec 1 11:44:12 2016 -0500 ---------------------------------------------------------------------- examples/flexjs/TeamPage/build.xml | 3 +++ .../TeamPage/src/main/flex/MemberItemRenderer.mxml | 11 ++++++++--- .../flexjs/TeamPage/src/main/flex/MyInitialView.mxml | 11 +++++++++-- examples/flexjs/TeamPage/src/main/flex/TeamPage.mxml | 1 + 4 files changed, 21 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a84c987f/examples/flexjs/TeamPage/build.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/build.xml b/examples/flexjs/TeamPage/build.xml index 81f109c..7b9ed5f 100644 --- a/examples/flexjs/TeamPage/build.xml +++ b/examples/flexjs/TeamPage/build.xml @@ -49,6 +49,9 @@ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/> <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <copy file="${basedir}/src/main/resources/team.json" tofile="${basedir}/bin-debug/team.json" /> + <copy file="${basedir}/src/main/resources/team.json" tofile="${basedir}/bin/js-debug/team.json" /> + <copy file="${basedir}/src/main/resources/team.json" tofile="${basedir}/bin/js-release/team.json" /> </target> <target name="clean"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a84c987f/examples/flexjs/TeamPage/src/main/flex/MemberItemRenderer.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/src/main/flex/MemberItemRenderer.mxml b/examples/flexjs/TeamPage/src/main/flex/MemberItemRenderer.mxml index a3ab4a0..01135bf 100644 --- a/examples/flexjs/TeamPage/src/main/flex/MemberItemRenderer.mxml +++ b/examples/flexjs/TeamPage/src/main/flex/MemberItemRenderer.mxml @@ -19,7 +19,8 @@ limitations under the License. --> <js:MXMLItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:local="*" - xmlns:js="library://ns.apache.org/flexjs/basic"> + xmlns:js="library://ns.apache.org/flexjs/basic" + width="25%" > <fx:Script> <![CDATA[ @@ -42,7 +43,10 @@ limitations under the License. memberID.text = _member.apacheID; if (_member.title != null && _member.title.length > 0) { - memberName.text = _member.name+", "+_member.title; + memberTitle.text = _member.title; + memberTitle.visible = true; + } else { + memberTitle.visible = false; } for (var type:String in _member.social) { @@ -71,12 +75,13 @@ limitations under the License. <js:Image id="memberPhoto" width="128" height="128" /> <js:Spacer width="10" /> - <js:VContainer id="contentArea" height="100%" > + <js:VContainer id="contentArea" > <js:style> <js:SimpleCSSStyles verticalAlign="top" /> </js:style> <js:Label id="memberName" width="100%" className="MemberName" /> + <js:Label id="memberTitle" width="100%" className="MemberTitle" /> <js:Label id="memberID" width="100%" className="ApacheID" /> <js:Spacer height="10" /> <js:HContainer id="socialMedia" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a84c987f/examples/flexjs/TeamPage/src/main/flex/MyInitialView.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/src/main/flex/MyInitialView.mxml b/examples/flexjs/TeamPage/src/main/flex/MyInitialView.mxml index 47ac02b..cf71623 100644 --- a/examples/flexjs/TeamPage/src/main/flex/MyInitialView.mxml +++ b/examples/flexjs/TeamPage/src/main/flex/MyInitialView.mxml @@ -49,6 +49,12 @@ limitations under the License. font-weight: bold; color: #333333; } + + .MemberTitle { + font-size: 10pt; + font-style: italic; + color: #333333; + } </fx:Style> <js:beads> @@ -56,13 +62,14 @@ limitations under the License. </js:beads> - <js:VContainer id="output" width="800" height="100%"> + <js:VContainer id="output" width="100%" height="100%"> <js:Label text="FlexJS Team Page" className="Heading1" /> <js:Spacer height="20" /> <!-- This list does not use selections, so it has a special controller. --> - <js:List width="800" height="500" itemRenderer="MemberItemRenderer" rowHeight="250" className="Repeater"> + <js:List width="100%" itemRenderer="MemberItemRenderer" className="Repeater"> <js:beads> + <js:HorizontalFlowLayout rowGap="100" columnGap="20" /> <local:NoSelectionController /> <js:SimpleBinding destinationPropertyName="dataProvider" sourceID="applicationModel" http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a84c987f/examples/flexjs/TeamPage/src/main/flex/TeamPage.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/src/main/flex/TeamPage.mxml b/examples/flexjs/TeamPage/src/main/flex/TeamPage.mxml index 5d8f861..36ad09a 100644 --- a/examples/flexjs/TeamPage/src/main/flex/TeamPage.mxml +++ b/examples/flexjs/TeamPage/src/main/flex/TeamPage.mxml @@ -37,6 +37,7 @@ </js:initialView> <js:beads> + <js:BrowserResizeHandler /> <js:HTTPService id="service" url="team.json"> <js:LazyCollection id="collection"> <js:inputParser>