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/a77717a1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a77717a1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a77717a1 Branch: refs/heads/feature/mdl Commit: a77717a154b65f7396becb32e45979cd3b3bb188 Parents: f02ccba 299be84 Author: yishayw <[email protected]> Authored: Fri Dec 16 22:05:18 2016 +0200 Committer: yishayw <[email protected]> Committed: Fri Dec 16 22:05:18 2016 +0200 ---------------------------------------------------------------------- examples/flexjs/ASDoc/pom.xml | 26 ++-- .../src/main/resources/data/catalog.json | 6 +- .../src/main/resources/data/catalog.json | 6 +- .../flexjs/MDLExample/src/main/flex/Cards.mxml | 12 +- .../flexjs/MDLExample/src/main/flex/Chips.mxml | 7 +- .../flex/org/apache/flex/core/CSSTextField.as | 11 +- .../main/flex/org/apache/flex/html/DataGrid.as | 4 + .../main/flex/org/apache/flex/html/TextNode.as | 99 ++++++++++++ .../org/apache/flex/html/beads/DataGridView.as | 16 ++ .../HTML/src/main/resources/basic-manifest.xml | 1 + .../org/apache/flex/mdl/beads/ContactChip.as | 108 ++++--------- .../flex/org/apache/flex/mdl/beads/MdlColor.as | 156 +++++++++++++++++++ .../src/main/resources/mdl-manifest.xml | 1 + 13 files changed, 343 insertions(+), 110 deletions(-) ----------------------------------------------------------------------
