You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2017/08/08 21:16:21 UTC
[45/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs 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/dee26275
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dee26275
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dee26275
Branch: refs/heads/feature/strand-work
Commit: dee26275eaea12a8a36a689906b6e0bac2a21897
Parents: 9dac303 8d6d7ca
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Mon Aug 7 14:27:56 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Mon Aug 7 14:27:56 2017 +0300
----------------------------------------------------------------------
.../flexjs/examples/tests/ExampleBuildTest.java | 3 +
examples/flexjs/FlexTeamPage_MDL/pom.xml | 32 +-
.../src/main/config/compile-app-config.xml | 2 +-
.../MDLExample/src/main/flex/Toggles.mxml | 13 +-
examples/flexjs/TeamPage/pom.xml | 15 -
examples/flexjs/pom.xml | 1 +
.../main/flex/org/apache/flex/css2/Cursors.as | 1 -
.../html/beads/layouts/HorizontalFlexLayout.as | 298 ++++++++++---------
.../layouts/OneFlexibleChildHorizontalLayout.as | 3 +-
.../layouts/OneFlexibleChildVerticalLayout.as | 3 +-
.../html/beads/layouts/VerticalFlexLayout.as | 288 +++++++++---------
.../html/beads/SingleSelectionDragSourceBead.as | 2 +
.../beads/controllers/DragMouseController.as | 1 -
.../beads/controllers/DropMouseController.as | 9 +-
.../main/flex/org/apache/flex/mdl/CheckBox.as | 26 +-
.../textLayout/compose/utils/AdornmentUtils.as | 4 +-
.../textLayout/elements/FlowGroupElement.as | 14 +-
.../flex/textLayout/elements/FlowLeafElement.as | 14 +-
.../apache/flex/text/engine/ElementFormat.as | 3 +-
.../org/apache/flex/text/engine/FontMetrics.as | 20 ++
.../org/apache/flex/text/engine/ITextLine.as | 4 +-
.../flex/org/apache/flex/text/html/TextLine.as | 11 +-
frameworks/projects/XML/src/main/flex/XML.as | 30 +-
23 files changed, 423 insertions(+), 374 deletions(-)
----------------------------------------------------------------------