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 2014/11/11 23:08:44 UTC

[28/28] git commit: [flex-asjs] [refs/heads/develop] - switch to using entire components instead of injecting beads because JS implementations will be simple wrappers

switch to using entire components instead of injecting beads because JS implementations will be simple wrappers


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e70257a9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e70257a9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e70257a9

Branch: refs/heads/develop
Commit: e70257a9d2a1f9508a902b0f60df89f4c2aeb904
Parents: 3f1111c
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 10 09:13:51 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Nov 11 14:08:00 2014 -0800

----------------------------------------------------------------------
 .../src/productsView/ProductCatalogThumbnail.mxml        |  6 +-----
 .../FlexJSStore/src/productsView/ProductFilterPanel.mxml | 11 +++--------
 2 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e70257a9/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
index 6b6d7a6..bd2fce0 100755
--- a/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductCatalogThumbnail.mxml
@@ -178,11 +178,7 @@ limitations under the License.
         <basic:Label id="compHigh1" text="Highlight: {product.highlight1}" includeIn="compare"/>
         <basic:Label id="compHigh2" text="Highlight: {product.highlight2}" includeIn="compare"/>
         <basic:Label text="Description:" includeIn="compare"/>
-        <basic:Label id="compDesc" text="{product.description}" width="100%" includeIn="compare">
-            <basic:beads>
-                <basic:MultilineTextFieldView />
-            </basic:beads>
-        </basic:Label>
+        <basic:MultilineLabel id="compDesc" text="{product.description}" width="100%" includeIn="compare"/>
     </basic:VContainer>
 
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e70257a9/examples/FlexJSStore/src/productsView/ProductFilterPanel.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductFilterPanel.mxml b/examples/FlexJSStore/src/productsView/ProductFilterPanel.mxml
index c32ba78..4777e79 100755
--- a/examples/FlexJSStore/src/productsView/ProductFilterPanel.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductFilterPanel.mxml
@@ -200,18 +200,13 @@ limitations under the License.
 
     <basic:Spacer height="8"/>
     
-    <basic:TextButton id="compareButton" className="glass" 
+    <basic:ImageAndTextButton id="compareButton" className="glass" 
                   click.showingThumbnails="attemptCompare()"
                   click.showingComparison="dispatchFilter()"            
                   text.showingComparison="Back to thumbnail view"
                   text.showingThumbnails="Compare Items"
-                  >
-        <basic:beads>
-            <basic:ImageAndTextButtonView
-                image.showingThumbnails="assets/icon_compare.png"
-                image.showingComparison="assets/icon_tiles.png" />
-        </basic:beads>
-    </basic:TextButton>
+                  image.showingThumbnails="assets/icon_compare.png"
+                  image.showingComparison="assets/icon_tiles.png" />
     
     <basic:states>
        <mx:State name="showingThumbnails" />