You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/01 03:48:35 UTC
[36/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - get
SWF version working by injection more BasicLayouts
get SWF version working by injection more BasicLayouts
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e828d177
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e828d177
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e828d177
Branch: refs/heads/develop
Commit: e828d177b86c09752ee26bb96209323de2d98bee
Parents: df6f560
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 26 22:46:36 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Apr 27 14:15:17 2017 -0700
----------------------------------------------------------------------
.../FlexJSStore/src/main/flex/FlexJSStore.mxml | 3 +
.../FlexJSStore/src/main/flex/HomeView.mxml | 60 +++++++++++++-------
.../FlexJSStore/src/main/flex/ProductsView.mxml | 1 -
.../FlexJSStore/src/main/flex/SupportView.mxml | 2 +-
4 files changed, 43 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e828d177/examples/flexjs/FlexJSStore/src/main/flex/FlexJSStore.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/FlexJSStore.mxml b/examples/flexjs/FlexJSStore/src/main/flex/FlexJSStore.mxml
index 37d41cb..17b8632 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/FlexJSStore.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/FlexJSStore.mxml
@@ -250,6 +250,9 @@ limitations under the License.
click="headToSupport()"/>
</js:ControlBar>
<js:Group width="990" id="viewholder">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles paddingLeft="0" paddingRight="0"/>
</js:style>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e828d177/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml b/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml
index 484b970..3a93319 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml
@@ -32,7 +32,7 @@ Width and height are hard-coded in the root tag to help the Design view.
-->
<js:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
- xmlns="*" width="990" height="550"
+ xmlns="*"
initComplete="updateMapImage()">
<fx:Script>
<![CDATA[
@@ -47,6 +47,7 @@ Width and height are hard-coded in the root tag to help the Design view.
</fx:Script>
<js:beads>
<js:ContainerDataBinding />
+ <js:BasicLayout />
</js:beads>
<js:Group width="100%" height="100%" y="0" x="0" className="colorPanel">
<js:beads>
@@ -57,8 +58,13 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:VerticalLayout />
</js:beads>
<js:Group width="100%" height="100%">
-
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:Group height="60" className="homeSection">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles backgroundColor="#ebebe9" left="10" top="10" right="10"/>
</js:style>
@@ -68,6 +74,9 @@ Width and height are hard-coded in the root tag to help the Design view.
</js:Group>
<js:Group height="280" className="homeSection">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles backgroundColor="#ffffff" left="10" top="78" right="10" />
</js:style>
@@ -97,12 +106,15 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:Group height="174" className="homeSection">
<js:beads>
- <js:VerticalLayout />
+ <js:BasicLayout />
</js:beads>
<js:style>
<js:SimpleCSSStyles backgroundColor="#ebebe9" left="10" top="366" right="10" />
</js:style>
<js:Group width="100%" height="100%">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles left="10" top="10" />
</js:style>
@@ -114,21 +126,18 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:beads>
<js:HorizontalLayout />
</js:beads>
- <js:style>
- <js:SimpleCSSStyles verticalAlign="middle" />
- </js:style>
<js:TextInput height="20" width="40">
<js:beads>
<js:NumericOnlyTextInputBead/>
</js:beads>
</js:TextInput>
- <js:HRule width="8" height="2"/>
+ <js:HRule width="8" height="2" style="verticalAlign:'middle'"/>
<js:TextInput height="20" width="40">
<js:beads>
<js:NumericOnlyTextInputBead/>
</js:beads>
</js:TextInput>
- <js:HRule width="8" height="2"/>
+ <js:HRule width="8" height="2" style="verticalAlign:'middle'"/>
<js:TextInput height="20" width="40">
<js:beads>
<js:NumericOnlyTextInputBead/>
@@ -137,7 +146,7 @@ Width and height are hard-coded in the root tag to help the Design view.
</js:Group>
<js:Label text="Password"/>
- <js:TextInput height="20">
+ <js:TextInput id="password" height="20">
<js:beads>
<js:PasswordInputBead/>
</js:beads>
@@ -161,9 +170,15 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:VerticalLayout />
</js:beads>
<js:Group width="100%" height="100%">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<!-- can't use binding to set the mapImage source because the style isn't available early enough -->
<js:Group id="mapCanvas" height="35%" className="homeMap">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles left="0" right="10" top="10" />
</js:style>
@@ -175,6 +190,9 @@ Width and height are hard-coded in the root tag to help the Design view.
</js:Group>
<js:Group height="330" >
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles backgroundColor="#ffffff" borderStyle="solid" bottom="10" right="10" left="0" /> <!-- cornerRadius="4" -->
</js:style>
@@ -189,11 +207,11 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:beads>
<js:VerticalLayout />
</js:beads>
+ <js:Image id="image1" src="assets/akotter.jpg" style="margin:auto;"/>
<js:Group width="100%">
- <js:Image id="image1" src="assets/akotter.jpg" style="margin:auto;verticalCenter:0"/>
- </js:Group>
-
- <js:Group width="100%">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:Label text="Annette Kotter" id="feat_prod_1" style="margin:auto;fontWeight:'bold';fontSize:12"/>
</js:Group>
@@ -203,11 +221,11 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:beads>
<js:VerticalLayout />
</js:beads>
+ <js:Image id="image2" style="margin:auto;" src="assets/bcrater.jpg"/>
<js:Group width="100%">
- <js:Image id="image2" style="margin:auto;verticalCenter:0" src="assets/bcrater.jpg"/>
- </js:Group>
-
- <js:Group width="100%">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:Label text="Ben Crater" id="feat_prod_2" style="margin:auto;fontWeight:'bold';fontSize:12"/>
</js:Group>
@@ -217,11 +235,11 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:beads>
<js:VerticalLayout />
</js:beads>
+ <js:Image id="image3" style="margin:auto;" src="assets/jproctor.jpg"/>
<js:Group width="100%">
- <js:Image id="image3" style="margin:auto;verticalCenter:0" src="assets/jproctor.jpg"/>
- </js:Group>
-
- <js:Group width="100%">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:Label text="Jane Proctor" id="feat_prod_3" style="margin:auto;fontWeight:'bold';fontSize:12"/>
</js:Group>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e828d177/examples/flexjs/FlexJSStore/src/main/flex/ProductsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/ProductsView.mxml b/examples/flexjs/FlexJSStore/src/main/flex/ProductsView.mxml
index 579de46..0a38b28 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/ProductsView.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/ProductsView.mxml
@@ -23,7 +23,6 @@ limitations under the License.
<js:Container xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:productsView="productsView.*"
- width="990" height="550"
currentState="showFilter"
>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e828d177/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml b/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
index 3d02179..439c153 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
@@ -32,7 +32,7 @@ The width and height are hard-coded in the root tag to help the Design view.
<js:Container xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns="*" alpha="1.0"
- width="990" height="550">
+ >
<fx:Script>
<![CDATA[