update jquery version of FlexJSStore
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c6690b6d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c6690b6d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c6690b6d Branch: refs/heads/develop Commit: c6690b6d470a24847129f00d40bcf07fff852e27 Parents: d33fe63 Author: Alex Harui <[email protected]> Authored: Sun Aug 23 22:14:27 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Sun Aug 23 22:14:27 2015 -0700 ---------------------------------------------------------------------- .../FlexJSStore_jquery/src/FlexJSStore.mxml | 9 ++-- .../flexjs/FlexJSStore_jquery/src/HomeView.mxml | 27 +++------- .../FlexJSStore_jquery/src/ProductsView.mxml | 18 +++---- .../FlexJSStore_jquery/src/SupportView.mxml | 54 ++++++++++++-------- .../src/productsView/CatalogTitleButtons.mxml | 3 +- .../src/productsView/Grip.mxml | 9 ++-- .../src/productsView/ProductCart.mxml | 15 +++--- .../src/productsView/ProductCatalogPanel.mxml | 19 ++++--- .../ProductCatalogPanelTitleBarView.mxml | 4 +- .../productsView/ProductCatalogThumbnail.mxml | 2 +- .../src/productsView/ProductDetails.mxml | 23 ++++----- .../src/productsView/ProductFilterPanel.mxml | 2 +- .../src/productsView/ProductList.mxml | 13 +++-- 13 files changed, 95 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/FlexJSStore.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/FlexJSStore.mxml b/examples/flexjs/FlexJSStore_jquery/src/FlexJSStore.mxml index f5700a1..94a724f 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/FlexJSStore.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/FlexJSStore.mxml @@ -168,7 +168,7 @@ limitations under the License. <fx:Declarations> <js:HTTPService id="productService" url="data/catalog.json"> - <js:LazyCollection id="catalog"> + <js:LazyCollection id="catalog" complete="if (pView) pView.catalog = catalog"> <js:inputParser> <js:JSONInputParser /> </js:inputParser> @@ -186,7 +186,7 @@ limitations under the License. <js:ApplicationDataBinding /> </jquery:beads> <jquery:initialView> - <js:ViewBase width="990" height="550" + <js:ViewBase width="990" height="585" initComplete="completeHandler(null)" stateChangeComplete="chainStatesIfNeeded()"> <js:states> @@ -228,7 +228,6 @@ limitations under the License. <js:ControlBar id="acb" width="100%" className="storeControlBar" > <js:beads> <js:HorizontalLayout /> - <js:LayoutChangeNotifier watchedProperty="{image.width}" /> </js:beads> <js:Image id="image" /> <!-- click="toggleTheme()" --> @@ -252,13 +251,13 @@ limitations under the License. </js:ControlBar> <js:Container width="990" > <js:style> - <js:SimpleCSSStyles paddingLeft="0" paddingRight="0" horizontalCenter="0"/> + <js:SimpleCSSStyles paddingLeft="0" paddingRight="0"/> </js:style> <HomeView id="homeView" width="100%" height="550" includeIn="Home" /> <ProductsView id="pView" includeIn="Products" visible.ProductsPreBake="false" - width="100%" height="550" initComplete="pView.catalog = catalog" + width="100%" height="550" initComplete="if (catalog.length) pView.catalog = catalog" /> <SupportView id="supportView" includeIn="Support" width="100%" height="550" http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/HomeView.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/HomeView.mxml b/examples/flexjs/FlexJSStore_jquery/src/HomeView.mxml index caddb64..1882c7e 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/HomeView.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/HomeView.mxml @@ -101,7 +101,7 @@ Width and height are hard-coded in the root tag to help the Design view. <js:HContainer width="100%" height="25" > <js:style> - <js:SimpleCSSStyles horizontalAlign="left" verticalAlign="middle" /> + <js:SimpleCSSStyles verticalAlign="middle" /> </js:style> <js:TextInput height="20" width="40"/> <js:HRule width="8" height="2"/> @@ -135,7 +135,7 @@ Width and height are hard-coded in the root tag to help the Design view. <js:SimpleCSSStyles left="0" right="10" top="10" /> </js:style> <js:Image id="mapImage" width="487" height="100%" alpha="1.0" style="left:10;top:10"/> - <js:Label y="110" text="US Developers . Flex . FlexJS" width="95%" height="40" style="horizontalCenter:0;fontWeight:'bold';fontSize:22;color:#ffffff;fontFamily:'Arial';textAlign:'center'"/> + <js:Label y="110" text="US Developers . Flex . FlexJS" width="95%" height="40" style="margin:auto;fontWeight:'bold';fontSize:22;color:#ffffff;fontFamily:'Arial';textAlign:'center'"/> <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"/> @@ -150,45 +150,34 @@ Width and height are hard-coded in the root tag to help the Design view. <js:HContainer style="left:10;top:43" width="100%" height="100%"> <js:VContainer width="33%" height="100%"> - <js:beads> - <js:LayoutChangeNotifier watchedProperty="{image1.height}" /> - </js:beads> <js:Container width="100%"> - <js:Image id="image1" source="assets/akotter.jpg" style="horizontalCenter:0;verticalCenter:0"/> + <js:Image id="image1" source="assets/akotter.jpg" style="margin:auto;verticalCenter:0"/> </js:Container> <js:Container width="100%"> - <js:Label text="Annette Kotter" id="feat_prod_1" style="horizontalCenter:0;fontWeight:'bold';fontSize:12"/> + <js:Label text="Annette Kotter" id="feat_prod_1" style="margin:auto;fontWeight:'bold';fontSize:12"/> </js:Container> </js:VContainer> <js:VContainer width="33%" height="100%"> - <js:beads> - <js:LayoutChangeNotifier watchedProperty="{image2.height}" /> - </js:beads> - <js:Container width="100%"> - <js:Image id="image2" style="horizontalCenter:0;verticalCenter:0" source="assets/bcrater.jpg"/> + <js:Image id="image2" style="margin:auto;verticalCenter:0" source="assets/bcrater.jpg"/> </js:Container> <js:Container width="100%"> - <js:Label text="Ben Crater" id="feat_prod_2" style="horizontalCenter:0;fontWeight:'bold';fontSize:12"/> + <js:Label text="Ben Crater" id="feat_prod_2" style="margin:auto;fontWeight:'bold';fontSize:12"/> </js:Container> </js:VContainer> <js:VContainer width="33%" height="100%"> - <js:beads> - <js:LayoutChangeNotifier watchedProperty="{image3.height}" /> - </js:beads> - <js:Container width="100%"> - <js:Image id="image3" style="horizontalCenter:0;verticalCenter:0" source="assets/jproctor.jpg"/> + <js:Image id="image3" style="margin:auto;verticalCenter:0" source="assets/jproctor.jpg"/> </js:Container> <js:Container width="100%"> - <js:Label text="Jane Proctor" id="feat_prod_3" style="horizontalCenter:0;fontWeight:'bold';fontSize:12"/> + <js:Label text="Jane Proctor" id="feat_prod_3" style="margin:auto;fontWeight:'bold';fontSize:12"/> </js:Container> </js:VContainer> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/ProductsView.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/ProductsView.mxml b/examples/flexjs/FlexJSStore_jquery/src/ProductsView.mxml index c563653..70fccd1 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/ProductsView.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/ProductsView.mxml @@ -75,7 +75,9 @@ limitations under the License. className="colorPanel" height="100%" width="100%" > - + <js:beads> + <js:OneFlexibleChildHorizontalLayout flexibleChild="spacer" /> + </js:beads> <productsView:Grip id="filterGrip" gripIcon="assets/icon_magnifier.png" gripTip="Show filter panel" click="currentState = 'showFilter'"/> @@ -84,18 +86,12 @@ limitations under the License. compare="catalogPanel.compare(filterPanel.productList.getProducts())" initComplete="if (catalog) filterPanel.filter.count = catalog.length"/> - <productsView:ProductCart id="cartPanel" width="265" height="100%"> - <productsView:style> - <js:SimpleCSSStyles right="{cartGrip.width}" top="0" /> - </productsView:style> - </productsView:ProductCart> + <js:Spacer id="spacer" /> + + <productsView:ProductCart id="cartPanel" width="265" height="100%" /> <productsView:Grip id="cartGrip" gripIcon="assets/icon_cart_empty.png" - gripTip="Show cart" click="currentState = 'showCart'"> - <productsView:style> - <js:SimpleCSSStyles right="0" top="0"/> - </productsView:style> - </productsView:Grip> + gripTip="Show cart" click="currentState = 'showCart'" /> </js:Container> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml b/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml index fb68a6c..c0579e4 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml @@ -36,7 +36,7 @@ The width and height are hard-coded in the root tag to help the Design view. <fx:Script> <![CDATA[ - import org.apache.flex.html.SimpleAlert; + import org.apache.flex.html.SimpleAlert; ]]> </fx:Script> @@ -52,22 +52,22 @@ The width and height are hard-coded in the root tag to help the Design view. <js:HContainer x="0" y="0" width="100%" height="100%" className="colorPanel"> <js:VContainer width="32%" height="100%"> - <js:Container width="100%" height="60%"> + <js:Container width="100%" height="420"> <js:Label y="10" text="Check Location" className="sectionHeader" x="20"/> - <js:Container width="95%" height="150" y="64" style="horizontalCenter:0"> + <js:Container height="150" y="64" style="margin:auto"> <js:beads> <js:VerticalColumnLayout numColumns="2" /> </js:beads> - <js:Label text="Address:" width="100%"/> - <js:TextInput id="address" width="90%"/> + <js:Label text="Address:"/> + <js:TextInput id="address"/> - <js:Label text="City:" width="100%"/> - <js:TextInput id="city" width="60%"/> + <js:Label text="City:" style="marginTop:20"/> + <js:TextInput id="city" style="marginTop:20"/> - <js:Label text="State:" width="100%"/> - <js:DropDownList id="state" width="50%"> + <js:Label text="State:" style="marginTop:20"/> + <js:DropDownList id="state" style="marginTop:20"> <js:dataProvider> <fx:Array> <fx:String>California</fx:String> @@ -78,45 +78,55 @@ The width and height are hard-coded in the root tag to help the Design view. </js:dataProvider> </js:DropDownList> - <js:Label text="ZIP Code:" width="100%" /> - <js:TextInput id="zip" width="30%"/> + <js:Label text="ZIP Code:" style="marginTop:20"/> + <js:TextInput id="zip" style="marginTop:20"/> </js:Container> - <js:Label y="38" text="Option1: Enter Address" style="horizontalCenter:0" className="instructions"/> + <js:Label y="38" text="Option1: Enter Address" style="margin:auto" className="instructions"/> <js:TextButton y="297" text="Locate" click="SimpleAlert.show('This feature is not implemented in this sample', 'Locate')" - style="horizontalCenter:0"/> + style="margin:auto"/> - <js:HContainer y="327" width="80%" height="20" > + <js:HContainer y="327" height="20" > <js:style> - <js:SimpleCSSStyles horizontalAlign="center" verticalAlign="middle" horizontalCenter="0" /> + <js:SimpleCSSStyles margin="auto" verticalAlign="middle" /> </js:style> <js:HRule width="60" /> <js:Label text="OR"/> <js:HRule width="60" /> </js:HContainer> - <js:Label y="355" text="Option 2: Drag this marker into the map" style="horizontalCenter:0" className="instructions"/> + <js:Label y="355" text="Option 2: Drag this marker into the map" style="margin:auto" className="instructions"/> - <js:Image y="380" style="horizontalCenter:0" source="assets/support_mapmarker_plus.png"/> + <js:Image y="380" style="margin:auto" source="assets/support_mapmarker_plus.png"/> - <js:HRule y="415" style="horizontalCenter:0" width="200" alpha="0.6"/> + <js:HRule y="415" style="margin:auto" width="200" alpha="0.6"/> </js:Container> - <js:Container width="100%" height="40%"> + <js:Container width="100%" height="130"> <js:VContainer width="80%" height="90%" > <js:style> - <js:SimpleCSSStyles horizontalCenter="0" top="0"/> + <js:SimpleCSSStyles margin="auto" top="0"/> </js:style> <js:Label text="Location" className="instructions"/> <js:List width="100%" dataProvider="{locations}"> <js:itemRenderer> <fx:Component> <js:DataItemRenderer className="listItem" width="100%"> - <js:Image width="21" height="25" source="{data.image}" /> - <js:Label width="100%" text="{data.name}" /> + <fx:Script> + <![CDATA[ + import samples.flexstore.Product; + [Bindable("__NoChangeEvent__")] + private function get product():Product + { + return data as Product; + } + ]]> + </fx:Script> + <js:Image width="21" height="25" source="{product.image}" /> + <js:Label width="100%" text="{product.name}" /> </js:DataItemRenderer> </fx:Component> </js:itemRenderer> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/CatalogTitleButtons.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/CatalogTitleButtons.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/CatalogTitleButtons.mxml index 9dbd4c8..77456be 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/CatalogTitleButtons.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/CatalogTitleButtons.mxml @@ -28,6 +28,7 @@ limitations under the License. <js:beads> <js:ParentDocumentBead id="pdb" /> <js:ContainerDataBinding /> + <js:LayoutChangeNotifier watchedProperty="{viewCart.text}" initialValue="#FFFFFF" /> </js:beads> <fx:Script> <![CDATA[ @@ -55,7 +56,7 @@ limitations under the License. className.showCart="catalogTitleButtonDeselected" rollOver.showCart="rollOverLabel(event)" rollOut.showCart="rollOutLabel(event)"/> - <js:HRule height="{findPhones.height * .75}" alpha=".75" style="color:#333333" /> + <js:VRule height="{findPhones.height * .75}" alpha=".75" style="color:#333333" /> <js:Label id="viewCart" text="View Cart ({cartCount} items)" click="currentState = 'showCart'" className.showFilter="catalogTitleButtonDeselected" className.showCart="catalogTitleButtonSelected" http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/Grip.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/Grip.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/Grip.mxml index 2938156..281c572 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/Grip.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/Grip.mxml @@ -17,11 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<js:VContainer xmlns:fx="http://ns.adobe.com/mxml/2009"; +<js:Container xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:js="library://ns.apache.org/flexjs/basic" width="17" height="100%" > <js:style> - <js:SimpleCSSStyles paddingTop="10" horizontalAlign="center" /> + <js:SimpleCSSStyles paddingTop="10" /> </js:style> <fx:Script> @@ -35,8 +35,7 @@ limitations under the License. </fx:Script> <js:beads> <js:ContainerDataBinding /> - <js:LayoutChangeNotifier watchedProperty="{icon.height}" initialValue="0" /> - <js:LayoutChangeNotifier watchedProperty="{grip.height}" initialValue="0" /> + <js:OneFlexibleChildVerticalLayout flexibleChild="grip" /> </js:beads> <js:Image id="icon" source="{gripIcon}" /> @@ -46,4 +45,4 @@ limitations under the License. </js:beads> </js:Image> -</js:VContainer> +</js:Container> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCart.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCart.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCart.mxml index 8c42027..830bf21 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCart.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCart.mxml @@ -22,7 +22,7 @@ limitations under the License. xmlns:productsView="productsView.*" > <js:style> - <js:SimpleCSSStyles horizontalAlign="right" + <js:SimpleCSSStyles paddingTop="8" paddingBottom="8" paddingRight="4" @@ -30,7 +30,7 @@ limitations under the License. </js:style> <js:beads> <js:ContainerDataBinding /> - <js:OneFlexibleChildVerticalLayout id="flexLayout" flexibleChild="{productList}" /> + <js:OneFlexibleChildVerticalLayout id="flexLayout" flexibleChild="productList" /> </js:beads> <fx:Script> <![CDATA[ @@ -96,21 +96,22 @@ limitations under the License. removeProduct="productListEventHandler(event)" showQuantity="true" /> - <js:Container style="paddingRight:0" width="100%"> + <js:Container style="right:0" id="totalContainer"> <js:beads> <js:VerticalColumnLayout numColumns="2" /> </js:beads> - <js:Label text="Total:" width="100%" /> + <js:Label text="Total:" /> <js:Label width="70" text="{cf.format(total)}" id="lblTotal" style="textAlign:'right'"/> - <js:Label text="Service Fee:" width="100%" /> + <js:Label text="Service Fee:" /> <js:Label width="70" text="{cf.format(numProducts * SHIPPING)}" id="lblFee" style="textAlign:'right'"/> - <js:Label text="Grand Total:" style="fontWeight:'bold'" width="100%" /> + <js:Label text="Grand Total:" style="fontWeight:'bold'" /> <js:Label width="70" text="{cf.format(total + (numProducts * SHIPPING))}" id="lblGrandTotal" style="textAlign:'right'"/> </js:Container> - <js:TextButton text="Submit Order" click="SimpleAlert.show('This feature is not implemented in this sample', 'Submit Order')"/> + <js:TextButton text="Submit Order" click="SimpleAlert.show('This feature is not implemented in this sample', 'Submit Order')" + style="right:0"/> </js:Container> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml index 47597ed..48fa69a 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml @@ -22,6 +22,7 @@ limitations under the License. implements="org.apache.flex.core.IDragInitiator" xmlns:productsView="productsView.*" currentState="browse" + title="SpaceHolder" title.browse="Browse" title.compare="Product Comparison" title.details="Product Details" @@ -89,7 +90,7 @@ limitations under the License. { for (i=0; i < thumbnails.length; i++) { - thumbContent.removeElement(thumbnails[i]); + thumbContentGroup.removeElement(thumbnails[i]); } } @@ -108,7 +109,7 @@ limitations under the License. // thumbnails[i].showInAutomationHierarchy = true; thumb.product = catalog.getItemAt(i) as Product; accepted[thumb.product.productId.toString()] = true; - thumbContent.addElement(thumb); + thumbContentGroup.addElement(thumb); thumb.addEventListener(ProductThumbEvent.PURCHASE, productThumbEventHandler); thumb.addEventListener(ProductThumbEvent.COMPARE, productThumbEventHandler); thumb.addEventListener(ProductThumbEvent.DETAILS, productThumbEventHandler); @@ -350,7 +351,7 @@ limitations under the License. var row:int = -1; //should be computed using border metrics instead of hard-coding the 20, but... - var xTo:Number = thumbContent.width - ProductCatalogThumbnail.COL_WIDTH_4 - 20; + var xTo:Number = thumbContentGroup.width - ProductCatalogThumbnail.COL_WIDTH_4 - 20; var yTo:Number; var move:Move; @@ -404,10 +405,10 @@ limitations under the License. { scv.verticalScrollPosition = y; } - else if (selectedThumb.y + ProductCatalogThumbnail.COL_HEIGHT_4 > curpos + thumbContent.height) + else if (selectedThumb.y + ProductCatalogThumbnail.COL_HEIGHT_4 > curpos + thumbContentGroup.height) { //this logic doesn't seem to be perfect but it will do - var diff:int = selectedThumb.y - (curpos + thumbContent.height) + var diff:int = selectedThumb.y - (curpos + thumbContentGroup.height) scv.verticalScrollPosition += diff + ProductCatalogThumbnail.COL_HEIGHT_4 + ProductCatalogThumbnail.VERTICAL_GAP; } }); @@ -509,7 +510,7 @@ limitations under the License. <js:ParentDocumentBead id="pdb" /> <js:PanelView> <js:titleBar> - <js:TitleBar> + <js:TitleBar height="20" > <js:style> <js:SimpleCSSStyles backgroundColor="0xA65904" /> </js:style> @@ -523,12 +524,10 @@ limitations under the License. <js:Container width="100%" height="100%"> <js:Container id="thumbContentGroup" width="100%" height="100%"> <js:beads> - <js:ScrollingContainerView id="scv" /> - <js:BasicScrollingLayout /> + <js:ScrollingViewport id="scv" /> </js:beads> - <js:Container id="thumbContent" width="100%" height="100%" /> </js:Container> - <productsView:ProductDetails id="details" + <productsView:ProductDetails id="details" y="0" width="{ProductCatalogThumbnail.COL_WIDTH_4 * 3}" height="100%" visible="false" http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanelTitleBarView.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanelTitleBarView.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanelTitleBarView.mxml index b89c7b6..5e82f95 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanelTitleBarView.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogPanelTitleBarView.mxml @@ -38,12 +38,12 @@ limitations under the License. <js:beads> <js:MXMLBeadViewBaseDataBinding /> <js:ParentDocumentBead id="pdb" /> - <js:LayoutChangeNotifier watchedProperty="{titleLabel.height}" /> + <js:LayoutChangeNotifier watchedProperty="{buttons.width}" /> </js:beads> <js:Label id="titleLabel" text="{ITitleBarModel(model).title}" /> <js:CloseButton id="closeButton" click="clickHandler()" visible="{ITitleBarModel(model).showCloseButton}"; /> - <productsView:CatalogTitleButtons /> + <productsView:CatalogTitleButtons id="buttons" /> </js:MXMLBeadViewBase> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogThumbnail.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogThumbnail.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogThumbnail.mxml index 848d202..dec248f 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogThumbnail.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductCatalogThumbnail.mxml @@ -37,7 +37,7 @@ limitations under the License. <js:LayoutChangeNotifier watchedProperty="{borderStyles.borderColor}" initialValue="#FFFFFF" /> </js:beads> <js:style> - <js:BindableCSSStyles id="borderStyles" borderStyle="solid" + <js:BindableCSSStyles id="borderStyles" borderStyle="solid" borderWidth="1" borderColor="#FFFFFF" backgroundColor="#FFFFFF"/> </js:style> <fx:Metadata> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductDetails.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductDetails.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductDetails.mxml index d1b89ab..f0162ad 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductDetails.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductDetails.mxml @@ -33,7 +33,7 @@ limitations under the License. <fx:Script> <![CDATA[ - + import samples.flexstore.Product; import samples.flexstore.ProductThumbEvent; @@ -77,25 +77,25 @@ limitations under the License. </fx:Array> </js:dataProvider> </js:ButtonBar> - <js:Container width="100%" height="100%" > + <js:Container > <js:style> <js:SimpleCSSStyles left="4" right="8" top="34" bottom="4" /> </js:style> - <js:VContainer width="100%" height="100%" includeIn="Features" > + <js:VContainer includeIn="Features" > <js:style> <!--<js:SimpleCSSStyles gap="8"--> <js:SimpleCSSStyles - paddingLeft="8" paddingTop="8" paddingRight="8" paddingBottom="8"/> + left="8" top="8" right="8" bottom="8"/> </js:style> - <js:HContainer width="100%" style="gap:12"> + <js:Container style="left:0px;right:0px"> <js:Image id="img" width="101" height="101" source="{product.image}"/> - <js:VContainer id="descr" width="100%" height="100%"> + <js:VContainer id="descr" > <js:style> - <js:SimpleCSSStyles paddingTop="0" /> + <js:SimpleCSSStyles top="0" left="105" right="0" bottom="20" /> <!--<js:SimpleCSSStyles paddingTop="0" gap="4" />--> </js:style> @@ -110,9 +110,9 @@ limitations under the License. <js:Label text="{cf.format(product.price)}" style="fontWeight:'bold'"/> </js:VContainer> - </js:HContainer> + </js:Container> - <js:Label id="descriptionText" width="100%" height="100%" text="{product.description}"/> + <js:Label id="descriptionText" style="left:0px;right:0px;bottom:0px" text="{product.description}"/> </js:VContainer> @@ -121,11 +121,6 @@ limitations under the License. </js:Container> <js:VContainer> - <js:beads> - <js:LayoutChangeNotifier watchedProperty="{purchase.height}" initialValue="0" /> - <js:LayoutChangeNotifier watchedProperty="{compare.height}" initialValue="0" /> - <js:LayoutChangeNotifier watchedProperty="{tiles.height}" initialValue="0" /> - </js:beads> <js:style> <js:SimpleCSSStyles marginTop="4" right="16" top="36" /> </js:style> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductFilterPanel.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductFilterPanel.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductFilterPanel.mxml index cffd4a4..26deaa9 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductFilterPanel.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductFilterPanel.mxml @@ -161,7 +161,7 @@ limitations under the License. thumbPress="thumbBeingPressed=true" thumbRelease="thumbBeingPressed=false;dispatchFilter()" />--> - <js:HContainer> + <js:HContainer id="nsholder" width="100%"> <js:NumericStepper width="48%" id="loPrice" minimum="0" maximum="{hiPrice.value}" value="0" valueChange="dispatchFilter()" /> <js:NumericStepper width="48%" id="hiPrice" minimum="{loPrice.value}" maximum="200" value="200" valueChange="dispatchFilter()" /> </js:HContainer> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6690b6d/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductList.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductList.mxml b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductList.mxml index c1a67c7..951b1fa 100755 --- a/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductList.mxml +++ b/examples/flexjs/FlexJSStore_jquery/src/productsView/ProductList.mxml @@ -21,7 +21,7 @@ limitations under the License. xmlns:js="library://ns.apache.org/flexjs/basic" > <js:style> - <js:SimpleCSSStyles borderStyle="solid" backgroundColor="#BCB29F" /> + <js:SimpleCSSStyles borderStyle="solid" borderWidth="1" backgroundColor="#BCB29F" /> </js:style> <!-- need a background color for drag and drop but can set alpha to 0 --> @@ -44,7 +44,7 @@ limitations under the License. import samples.flexstore.Product; import samples.flexstore.ProductListEvent; - public var items:Array = []; + public var items:Array; public var newItemStartX:int; public var newItemStartY:int; @@ -56,6 +56,9 @@ limitations under the License. public function addProduct(product:Product):void { + if (items == null) + items = []; + var index:int = indexOf(product.productId); var event:ProductListEvent; var item:ProductListItem; @@ -169,7 +172,7 @@ limitations under the License. { e.addEventListener(Effect.EFFECT_END, function(event:Event):void { - scrollingView.verticalScrollPosition = scrollingView.maxVerticalScrollPosition; + //TODO scrollingView.model.verticalScrollPosition = scrollingView.maxVerticalScrollPosition; }); } } @@ -208,8 +211,8 @@ limitations under the License. </fx:Script> <js:beads> <js:DropMouseController id="dmc" dragEnter="doDragEnter(event)" dragDrop="doDragDrop(event)" /> - <js:ScrollingContainerView id="scrollingView" /> - <js:VerticalScrollingLayout /> + <js:VerticalLayout /> + <js:ScrollingViewport id="scrollingView" /> </js:beads> <js:Container id="viewport" width="100%" height="100%" > </js:Container>
