You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/07/06 22:37:06 UTC
git commit: [flex-asjs] [refs/heads/develop] - FlexJSStore now
compiles for ActionScript.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 613a3fd3b -> 64870856f
FlexJSStore now compiles for ActionScript.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64870856
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64870856
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64870856
Branch: refs/heads/develop
Commit: 64870856f42c0c19a91662ad3b4536ca5aa64c3f
Parents: 613a3fd
Author: Peter Ent <pe...@apache.org>
Authored: Mon Jul 6 16:37:03 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Jul 6 16:37:03 2015 -0400
----------------------------------------------------------------------
.../src/productsView/ProductCatalogPanel.mxml | 11 +++++------
examples/FlexJSStore/src/productsView/ProductList.mxml | 6 +++---
examples/ListsTest/src/products/ProductItemRenderer.as | 5 +++++
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64870856/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml b/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
index 38ca2fc..e085222 100755
--- a/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
@@ -298,7 +298,7 @@ limitations under the License.
else
{
//since movement is happening get the scrollbar back to the top
- scv.verticalScrollPosition = 0;
+ scv.model.verticalScrollPosition = 0;
// Fade in newly selected thumbnails after the last
// visible thumbnail has moved to its new position.
move.addEventListener(Effect.EFFECT_END,
@@ -399,16 +399,16 @@ limitations under the License.
move.addEventListener(Effect.EFFECT_END,
function(e:org.apache.flex.events.Event):void
{
- var curpos:int = scv.verticalScrollPosition;
+ var curpos:int = scv.model.verticalScrollPosition;
if (selectedThumb.y < curpos)
{
- scv.verticalScrollPosition = y;
+ scv.model.verticalScrollPosition = y;
}
else if (selectedThumb.y + ProductCatalogThumbnail.COL_HEIGHT_4 > curpos + thumbContent.height)
{
//this logic doesn't seem to be perfect but it will do
var diff:int = selectedThumb.y - (curpos + thumbContent.height)
- scv.verticalScrollPosition += diff + ProductCatalogThumbnail.COL_HEIGHT_4 + ProductCatalogThumbnail.VERTICAL_GAP;
+ scv.model.verticalScrollPosition += diff + ProductCatalogThumbnail.COL_HEIGHT_4 + ProductCatalogThumbnail.VERTICAL_GAP;
}
});
}
@@ -523,8 +523,7 @@ 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>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64870856/examples/FlexJSStore/src/productsView/ProductList.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductList.mxml b/examples/FlexJSStore/src/productsView/ProductList.mxml
index b11c4dd..cc7e0ce 100755
--- a/examples/FlexJSStore/src/productsView/ProductList.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductList.mxml
@@ -172,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;
});
}
}
@@ -211,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>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64870856/examples/ListsTest/src/products/ProductItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/ListsTest/src/products/ProductItemRenderer.as b/examples/ListsTest/src/products/ProductItemRenderer.as
index 587cae6..c1bab26 100644
--- a/examples/ListsTest/src/products/ProductItemRenderer.as
+++ b/examples/ListsTest/src/products/ProductItemRenderer.as
@@ -48,6 +48,11 @@ package products
addElement(detail);
}
+ override public function get data():Object
+ {
+ return super.data;
+ }
+
override public function set data(value:Object):void
{
super.data = value;