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 2015/07/28 20:40:47 UTC
[21/36] git commit: [flex-asjs] [refs/heads/develop] - Merge branch
'develop' into flatui
Merge branch 'develop' into flatui
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f66378cb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f66378cb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f66378cb
Branch: refs/heads/develop
Commit: f66378cbf05e9ca14c5b58a858a5bb6178776754
Parents: 9d1950f 95cb140
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jul 24 06:17:39 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jul 24 06:17:39 2015 -0700
----------------------------------------------------------------------
examples/ContainerTest/build.xml | 48 +++++
examples/ContainerTest/src/ContainerTest.mxml | 39 ++++
examples/ContainerTest/src/MyInitialView.mxml | 180 +++++++++++++++++++
.../ContainerTest/src/assets/logo_orange.png | Bin 0 -> 33897 bytes
.../ContainerTest/src/models/ProductsModel.as | 44 +++++
examples/ContainerTest/src/products/Product.as | 43 +++++
.../src/products/ProductItemRenderer.as | 83 +++++++++
examples/ContainerTest/src/smallbluerect.jpg | Bin 0 -> 13500 bytes
examples/ContainerTest/src/smallgreenrect.jpg | Bin 0 -> 13542 bytes
examples/ContainerTest/src/smallorangerect.gif | Bin 0 -> 821 bytes
examples/ContainerTest/src/smallorangerect.jpg | Bin 0 -> 13571 bytes
examples/ContainerTest/src/smallpurplerect.jpg | Bin 0 -> 13517 bytes
examples/ContainerTest/src/smallredrect.jpg | Bin 0 -> 13477 bytes
examples/ContainerTest/src/smallyellowrect.jpg | Bin 0 -> 13598 bytes
examples/build.xml | 2 +
.../org/apache/flex/charts/beads/ChartView.as | 4 +
.../charts/beads/HorizontalCategoryAxisBead.as | 7 +
.../charts/beads/HorizontalLinearAxisBead.as | 7 +
.../charts/beads/VerticalCategoryAxisBead.as | 7 +
.../flex/charts/beads/VerticalLinearAxisBead.as | 7 +
.../flex/charts/beads/layouts/BarChartLayout.as | 10 +-
.../charts/beads/layouts/ColumnChartLayout.as | 10 +-
.../org/apache/flex/charts/core/ChartBase.js | 4 +-
.../charts/supportClasses/ChartAxisGroup.js | 6 +
.../js/src/org/apache/flex/core/BeadViewBase.js | 9 +-
frameworks/projects/HTML/as/defaults.css | 4 +-
.../HTML/as/src/org/apache/flex/html/List.as | 2 +-
.../org/apache/flex/html/beads/ButtonBarView.as | 4 +-
.../org/apache/flex/html/beads/ContainerView.as | 71 ++++++--
.../src/org/apache/flex/html/beads/ListView.as | 11 +-
.../src/org/apache/flex/html/beads/PanelView.as | 17 +-
.../flex/html/beads/PanelWithControlBarView.as | 38 ++--
.../flex/html/beads/SolidBackgroundBead.as | 3 +-
.../flex/html/beads/layouts/BasicLayout.as | 30 ----
.../flex/html/beads/layouts/ButtonBarLayout.as | 39 +---
.../flex/html/beads/layouts/HorizontalLayout.as | 37 +---
.../flex/html/beads/layouts/TileLayout.as | 37 +---
.../flex/html/beads/layouts/VerticalLayout.as | 37 +---
.../html/supportClasses/ScrollingViewport.as | 12 +-
.../org/apache/flex/html/MXMLBeadViewBase.as | 3 +
.../org/apache/flex/html/beads/DataGridView.as | 3 +
.../HTML/js/src/org/apache/flex/html/List.js | 18 +-
.../HTML/js/src/org/apache/flex/html/Panel.js | 2 +
.../org/apache/flex/html/beads/ContainerView.js | 171 +++++++++++++++---
.../src/org/apache/flex/html/beads/ListView.js | 19 +-
.../src/org/apache/flex/html/beads/PanelView.js | 30 ++--
.../ListSingleSelectionMouseController.js | 5 +-
.../flex/html/beads/layouts/ButtonBarLayout.js | 42 ++---
.../flex/html/beads/layouts/TileLayout.js | 29 +++
.../flex/html/beads/models/ViewportModel.js | 162 +++++++++++++++++
.../html/supportClasses/ContainerContentArea.js | 60 +++++++
.../html/supportClasses/DataItemRenderer.js | 15 +-
.../html/supportClasses/ScrollingViewport.js | 37 +++-
.../html/supportClasses/UIItemRendererBase.js | 5 +-
.../apache/flex/html/supportClasses/Viewport.js | 24 ++-
55 files changed, 1132 insertions(+), 345 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f66378cb/frameworks/projects/HTML/as/defaults.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f66378cb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/SolidBackgroundBead.as
----------------------------------------------------------------------