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/09/03 15:02:45 UTC
[4/4] git commit: [flex-asjs] [refs/heads/develop] - Merge branch
'containers' into develop
Merge branch 'containers' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3a9e1cc2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3a9e1cc2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3a9e1cc2
Branch: refs/heads/develop
Commit: 3a9e1cc2e647348c3bdb9a157f92f1e4b0f41324
Parents: 6f12327 cf3994f
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 3 06:02:43 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 3 06:02:43 2015 -0700
----------------------------------------------------------------------
.../org/apache/flex/charts/beads/ChartView.as | 44 +--
.../layouts/LineChartCategoryVsLinearLayout.as | 15 +-
.../layouts/LineChartLinearVsLinearLayout.as | 13 +-
.../flex/charts/beads/layouts/PieChartLayout.as | 13 +-
.../beads/layouts/StackedBarChartLayout.as | 13 +-
.../beads/layouts/StackedColumnChartLayout.as | 13 +-
frameworks/projects/Core/as/src/CoreClasses.as | 2 +-
.../as/src/org/apache/flex/core/IViewport.as | 78 ++--
.../src/org/apache/flex/core/IViewportModel.as | 116 ++----
.../Core/as/src/org/apache/flex/core/UIBase.as | 1 -
.../as/src/org/apache/flex/core/UIButtonBase.as | 1 -
.../as/src/org/apache/flex/core/UIMetrics.as | 127 -------
.../Core/as/src/org/apache/flex/geom/Size.as | 41 ++
.../as/src/org/apache/flex/utils/BeadMetrics.as | 151 --------
.../org/apache/flex/utils/CSSContainerUtils.as | 194 ++++++++++
.../js/src/org/apache/flex/core/IViewport.js | 9 -
.../src/org/apache/flex/core/IViewportModel.js | 68 +---
.../js/src/org/apache/flex/core/UIMetrics.js | 79 ----
.../js/src/org/apache/flex/geom/Rectangle.js | 26 ++
.../Core/js/src/org/apache/flex/geom/Size.js | 56 +++
.../js/src/org/apache/flex/utils/BeadMetrics.js | 84 -----
.../org/apache/flex/utils/CSSContainerUtils.js | 81 ++++
frameworks/projects/HTML/as/defaults.css | 14 +-
.../src/org/apache/flex/html/beads/AlertView.as | 6 +-
.../org/apache/flex/html/beads/ButtonBarView.as | 14 +-
.../org/apache/flex/html/beads/ContainerView.as | 199 ++++------
.../src/org/apache/flex/html/beads/ListView.as | 33 +-
.../src/org/apache/flex/html/beads/PanelView.as | 115 +++---
.../flex/html/beads/PanelWithControlBarView.as | 97 +++--
.../apache/flex/html/beads/SimpleAlertView.as | 6 +-
.../org/apache/flex/html/beads/TextInputView.as | 10 +-
.../flex/html/beads/TextInputWithBorderView.as | 6 +-
.../flex/html/beads/layouts/ButtonBarLayout.as | 8 +-
.../flex/html/beads/layouts/HScrollBarLayout.as | 6 +-
.../flex/html/beads/layouts/VScrollBarLayout.as | 6 +-
.../flex/html/beads/models/ViewportModel.as | 152 ++------
.../html/supportClasses/ScrollingViewport.as | 378 +++++++------------
.../supportClasses/TextFieldItemRenderer.as | 8 +-
.../apache/flex/html/supportClasses/Viewport.as | 143 +++----
.../FlexibleFirstChildHorizontalLayout.as | 47 +--
.../html/beads/layouts/VerticalColumnLayout.as | 4 +-
.../org/apache/flex/html/beads/ContainerView.js | 164 +++-----
.../src/org/apache/flex/html/beads/ListView.js | 40 +-
.../src/org/apache/flex/html/beads/PanelView.js | 80 ++--
.../flex/html/beads/layouts/ButtonBarLayout.js | 4 +-
.../flex/html/beads/models/ViewportModel.js | 68 +---
.../html/supportClasses/ScrollingViewport.js | 93 ++---
.../apache/flex/html/supportClasses/Viewport.js | 65 +++-
.../flex/mobile/beads/StackedViewManagerView.as | 2 -
.../flex/mobile/beads/TabbedViewManagerView.as | 2 -
.../apache/flex/mobile/beads/ViewManagerView.as | 2 -
51 files changed, 1165 insertions(+), 1832 deletions(-)
----------------------------------------------------------------------