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/13 07:18:54 UTC
git commit: [flex-asjs] [refs/heads/release0.8.0] - copy fixes from
FlexJSStore to FlexJSStore_jquery
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 a03fb4f6e -> b48777590
copy fixes from FlexJSStore to FlexJSStore_jquery
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b4877759
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b4877759
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b4877759
Branch: refs/heads/release0.8.0
Commit: b48777590c49323d930171f724be1078644e6e4b
Parents: a03fb4f
Author: Alex Harui <ah...@apache.org>
Authored: Sat May 13 00:18:45 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat May 13 00:18:45 2017 -0700
----------------------------------------------------------------------
.../src/main/flex/FlexJSStore.mxml | 8 +-
.../src/main/flex/HomeView.mxml | 194 ++++++++++++-------
.../src/main/flex/ProductsView.mxml | 1 -
.../src/main/flex/SupportView.mxml | 4 +-
.../flex/productsView/ProductCatalogPanel.mxml | 4 +-
.../productsView/ProductCatalogThumbnail.mxml | 4 +-
6 files changed, 133 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4877759/examples/flexjs/FlexJSStore_jquery/src/main/flex/FlexJSStore.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/flex/FlexJSStore.mxml b/examples/flexjs/FlexJSStore_jquery/src/main/flex/FlexJSStore.mxml
index c178316..2c24df9 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/main/flex/FlexJSStore.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/src/main/flex/FlexJSStore.mxml
@@ -249,7 +249,11 @@ limitations under the License.
className="storeButtonBar"
click="headToSupport()"/>
</js:ControlBar>
- <js:Container width="990" >
+ <js:Group width="990" id="viewholder">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
+
<js:style>
<js:SimpleCSSStyles paddingLeft="0" paddingRight="0"/>
</js:style>
@@ -262,7 +266,7 @@ limitations under the License.
<SupportView id="supportView" includeIn="Support"
width="100%" height="550"
/>
- </js:Container>
+ </js:Group>
</js:View>
</jquery:initialView>
</jquery:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4877759/examples/flexjs/FlexJSStore_jquery/src/main/flex/HomeView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/flex/HomeView.mxml b/examples/flexjs/FlexJSStore_jquery/src/main/flex/HomeView.mxml
index a4eb640..7a45c82 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/main/flex/HomeView.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/src/main/flex/HomeView.mxml
@@ -30,10 +30,10 @@ using x and y, especially when percentage widths and heights are used.
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"
+<js:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:jquery="library://ns.apache.org/flexjs/jquery"
- xmlns="*" width="990" height="550"
+ xmlns="*"
initComplete="updateMapImage()">
<fx:Script>
<![CDATA[
@@ -48,25 +48,43 @@ 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:HContainer width="100%" height="100%" y="0" x="0" className="colorPanel">
- <js:VContainer width="230" height="100%">
- <js:Container width="100%" height="100%">
-
- <js:Container height="60" className="homeSection">
+ <js:Group width="100%" height="100%" y="0" x="0" className="colorPanel">
+ <js:beads>
+ <js:HorizontalLayout />
+ </js:beads>
+ <js:Group width="230" height="100%">
+ <js:beads>
+ <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>
<js:Label style="left:10;top:10" text="Search Developers" height="22" className="sectionHeader" />
- <jquery:TextButton style="left:168;top:30" text="Go" width="27" height="20" className="glass" click="SimpleAlert.show('This feature is not implemented in this sample', 'Go')"/>
- <js:TextInput style="left:10;top:30" height="20" width="150"/>
- </js:Container>
+ <jquery:TextButton id="developerSearchButton" style="left:168;top:30" text="Go" width="27" height="20" className="glass" click="SimpleAlert.show('This feature is not implemented in this sample', 'Go')"/>
+ <js:TextInput id="developerSearchInput" style="left:10;top:30" height="20" width="150"/>
+ </js:Group>
- <js:Container height="280" className="homeSection">
+ <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>
- <js:VContainer width="100%" height="100%">
+ <js:Group width="100%" height="100%">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles left="10" top="10" />
</js:style>
@@ -84,14 +102,20 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:Label text="Students" className="homeProgramHeader"/>
<js:Label text="Free Assistance" style="fontSize:9"/>
<js:Spacer height="8" width="100%"/>
- </js:VContainer>
- </js:Container>
+ </js:Group>
+ </js:Group>
- <js:Container height="174" className="homeSection">
+ <js:Group height="174" className="homeSection">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles backgroundColor="#ebebe9" left="10" top="366" right="10" />
</js:style>
- <js:VContainer width="100%" height="100%">
+ <js:Group width="100%" height="100%">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
<js:style>
<js:SimpleCSSStyles left="10" top="10" />
</js:style>
@@ -99,19 +123,35 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:Label text="Phone Number"/>
- <js:HContainer width="100%" height="25" >
- <js:style>
- <js:SimpleCSSStyles verticalAlign="middle" />
- </js:style>
- <js:TextInput height="20" width="40"/>
- <js:HRule width="8" height="2"/>
- <js:TextInput height="20" width="40"/>
- <js:HRule width="8" height="2"/>
- <js:TextInput height="20" width="40"/>
- </js:HContainer>
+ <js:Group width="100%" height="25" >
+ <js:beads>
+ <js:HorizontalLayout />
+ </js:beads>
+ <js:TextInput height="20" width="40">
+ <js:beads>
+ <js:NumericOnlyTextInputBead/>
+ </js:beads>
+ </js:TextInput>
+ <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" style="verticalAlign:'middle'"/>
+ <js:TextInput height="20" width="40">
+ <js:beads>
+ <js:NumericOnlyTextInputBead/>
+ </js:beads>
+ </js:TextInput>
+ </js:Group>
<js:Label text="Password"/>
- <js:TextInput height="20"/>
+ <js:TextInput id="password" height="20">
+ <js:beads>
+ <js:PasswordInputBead/>
+ </js:beads>
+ </js:TextInput>
<js:Spacer height="8" width="100%"/>
<jquery:CheckBox text="Remember my phone number" selected="true"/>
@@ -119,18 +159,27 @@ Width and height are hard-coded in the root tag to help the Design view.
<jquery:TextButton text="Login" className="glass" height="20" width="55" click="SimpleAlert.show('This feature is not implemented in this sample', 'Login')"/>
- </js:VContainer>
- </js:Container>
+ </js:Group>
+ </js:Group>
- </js:Container>
+ </js:Group>
- </js:VContainer>
+ </js:Group>
- <js:VContainer width="750" height="100%">
- <js:Container width="100%" height="100%">
+ <js:Group width="750" height="100%">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
+ <js:Group width="100%" height="100%">
+ <js:beads>
+ <js:BasicLayout />
+ </js:beads>
- <!-- can't use binding to set the mapImage url because the style isn't available early enough -->
- <js:Container id="mapCanvas" height="35%" className="homeMap">
+ <!-- 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>
@@ -139,57 +188,54 @@ Width and height are hard-coded in the root tag to help the Design view.
<js:Label text="Learn More >>" width="95" style="fontSize:12;fontFamily:'Arial';bottom:10;right:10"/>
<js:Label text="$60/hr" style="color:#ffffff;fontWeight:'bold';fontFamily:'Arial';fontSize:20;right:10:top:10"/>
<js:Label text="Rates as low as" x="551" y="16" style="fontSize:12"/>
- </js:Container>
+ </js:Group>
- <js:Container height="330" >
+ <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>
<js:Label style="left:10;top:10" text="Featured Developers" width="173" height="25" className="sectionHeader"/>
- <js:HContainer style="left:10;top:43" width="100%" height="100%">
- <js:VContainer width="33%" height="100%">
- <js:Container width="100%">
- <js:Image id="image1" src="assets/akotter.jpg" style="margin:auto;verticalCenter:0"/>
- </js:Container>
-
- <js:Container width="100%">
- <js:Label text="Annette Kotter" id="feat_prod_1" style="margin:auto;fontWeight:'bold';fontSize:12"/>
- </js:Container>
-
- </js:VContainer>
+ <js:Group style="left:10;top:43" width="100%" height="100%">
+ <js:beads>
+ <js:HorizontalLayout />
+ </js:beads>
+ <js:Group width="33%" height="100%">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
+ <js:Image id="image1" src="assets/akotter.jpg" style="margin:auto;"/>
+ <js:Label text="Annette Kotter" id="feat_prod_1" style="textAlign:center;fontWeight:'bold';fontSize:12;"/>
+ </js:Group>
- <js:VContainer width="33%" height="100%">
- <js:Container width="100%">
- <js:Image id="image2" style="margin:auto;verticalCenter:0" src="assets/bcrater.jpg"/>
- </js:Container>
-
- <js:Container width="100%">
- <js:Label text="Ben Crater" id="feat_prod_2" style="margin:auto;fontWeight:'bold';fontSize:12"/>
- </js:Container>
-
- </js:VContainer>
+ <js:Group width="33%" height="100%">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
+ <js:Image id="image2" style="margin:auto;" src="assets/bcrater.jpg"/>
+ <js:Label text="Ben Crater" id="feat_prod_2" style="textAlign:center;fontWeight:'bold';fontSize:12;"/>
+ </js:Group>
- <js:VContainer width="33%" height="100%">
- <js:Container width="100%">
- <js:Image id="image3" style="margin:auto;verticalCenter:0" src="assets/jproctor.jpg"/>
- </js:Container>
-
- <js:Container width="100%">
- <js:Label text="Jane Proctor" id="feat_prod_3" style="margin:auto;fontWeight:'bold';fontSize:12"/>
- </js:Container>
-
- </js:VContainer>
+ <js:Group width="33%" height="100%">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
+ <js:Image id="image3" style="margin:auto;" src="assets/jproctor.jpg"/>
+ <js:Label text="Jane Proctor" id="feat_prod_3" style="textAlign:center;fontWeight:'bold';fontSize:12;"/>
+ </js:Group>
- </js:HContainer>
+ </js:Group>
- </js:Container>
+ </js:Group>
- </js:Container>
+ </js:Group>
- </js:VContainer>
+ </js:Group>
- </js:HContainer>
+ </js:Group>
-</js:Container>
+</js:Group>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4877759/examples/flexjs/FlexJSStore_jquery/src/main/flex/ProductsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/flex/ProductsView.mxml b/examples/flexjs/FlexJSStore_jquery/src/main/flex/ProductsView.mxml
index 579de46..0a38b28 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/main/flex/ProductsView.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/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/b4877759/examples/flexjs/FlexJSStore_jquery/src/main/flex/SupportView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/flex/SupportView.mxml b/examples/flexjs/FlexJSStore_jquery/src/main/flex/SupportView.mxml
index 3d02179..30adb78 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/main/flex/SupportView.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/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[
@@ -56,7 +56,7 @@ The width and height are hard-coded in the root tag to help the Design view.
<js:Label y="10" text="Check Location" className="sectionHeader" x="20"/>
- <js:Container height="150" y="64" style="margin:auto">
+ <js:Container height="200" width="100%" y="64" style="margin:auto">
<js:beads>
<js:VerticalColumnLayout numColumns="2" />
</js:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4877759/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogPanel.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogPanel.mxml b/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogPanel.mxml
index 3e04263..5fc7373 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogPanel.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogPanel.mxml
@@ -505,7 +505,7 @@ limitations under the License.
<js:beads>
<js:ContainerDataBinding />
- <js:VerticalLayout />
+ <js:BasicLayout />
<js:DragMouseController id="dragger" />
<js:ParentDocumentBead id="pdb" />
<js:PanelView>
@@ -521,7 +521,7 @@ limitations under the License.
</js:titleBar>
</js:PanelView>
</js:beads>
- <js:Container width="100%" height="100%">
+ <js:Container width="100%" height="100%" style="backgroundColor: #ffffff">
<js:Container id="thumbContentGroup" width="100%" height="100%">
<js:beads>
<js:ScrollingViewport id="scv" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b4877759/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogThumbnail.mxml b/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogThumbnail.mxml
index e869a0b..c339f5d 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogThumbnail.mxml
@@ -35,6 +35,8 @@ limitations under the License.
<js:beads>
<js:ContainerDataBinding />
<js:LayoutChangeNotifier watchedProperty="{borderStyles.borderColor}" initialValue="#FFFFFF" />
+ <js:LayoutChangeNotifier watchedProperty="{buttons.visible}" initialValue="false" />
+ <js:StyleChangeNotifier />
</js:beads>
<js:style>
<js:BindableCSSStyles id="borderStyles" borderStyle="solid" borderWidth="1"
@@ -156,7 +158,7 @@ limitations under the License.
<js:style>
<js:SimpleCSSStyles paddingTop="0" right="0" /> <!-- gap="0" -->
</js:style>
- <js:Label text="{product.featureString}" width="60" height="48" />
+ <js:MultilineLabel text="{product.featureString}" width="60" height="48" />
<js:Label text="{cf.format(product.price)}" style="fontWeight:bold"/>
<js:Spacer height="4"/>
<js:Label text="{product.highlight1}" style="color:#EE8D0C" includeIn="x3cols, x2cols"/>