Merge branch 'develop' into DateChooser * develop: (28 commits) build for asdoc more fixes for asdoc app only copy resource folder if it exists Simplify Materialcon estructure to allow further changes More icons, and new card example Set proper for layout for current selection. Use interfaces where possible. Fix bug where initial selection messes up layout. Wrong casting. Renamed InnerText to InnerHTML A bead to insert innerHTML text in a component element Shows only first row as in MDL web example Last things for MDL Lists fix span to avoid remove text element List with two lines, secondary content, subtitle and secondary info New List example with secondary actions Secondary action and material icon star fix list example IRs refactor list item primary content to be a bead Change innerHTML for a textNode to avoid remove text when using beads that âappendâ html tags ...
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3a741f1b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3a741f1b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3a741f1b Branch: refs/heads/feature/mdl Commit: 3a741f1b7add1521b68825b77f2ebc6a08f5f6cf Parents: a05642b e28de64 Author: Peter Ent <[email protected]> Authored: Mon Dec 12 11:29:25 2016 -0500 Committer: Peter Ent <[email protected]> Committed: Mon Dec 12 11:29:25 2016 -0500 ---------------------------------------------------------------------- examples/build_example.xml | 30 +- examples/flexjs/ASDoc/build.xml | 47 +- .../ASDoc/src/main/config/asdoc-config.xml | 473 +++++++++++++++++++ .../ASDoc/src/main/flex/ASDocMainView.mxml | 2 +- .../ASDoc/src/main/flex/DetailRenderer.mxml | 10 +- .../ASDoc/src/main/flex/models/ASDocModel.as | 69 ++- .../flexjs/MDLExample/src/main/flex/Cards.mxml | 37 +- .../flexjs/MDLExample/src/main/flex/Lists.mxml | 59 ++- .../ActorNameAndIconListItemRenderer.mxml | 49 ++ .../ActorNameListItemRenderer.mxml | 48 ++ .../AvatarAndActionListItemRenderer.mxml | 56 +++ ...vatarAndActionThreeLineListItemRenderer.mxml | 68 +++ .../AvatarAndActionTwoLineListItemRenderer.mxml | 83 ++++ .../itemRenderers/CustomListItemRenderer.mxml | 32 +- .../src/main/flex/models/ListsModel.as | 30 +- .../MDLExample/src/main/flex/vos/ActorVO.as | 35 ++ .../MDLExample/src/main/flex/vos/ProductVO.as | 27 ++ .../src/main/resources/mdl-styles.css | 65 ++- .../flex/binding/ItemRendererDataBinding.as | 76 ++- .../flex/org/apache/flex/utils/StrandUtils.as | 3 +- frameworks/projects/HTML/.vscode/tasks.json | 10 + .../src/main/flex/org/apache/flex/html/A.as | 3 - .../main/flex/org/apache/flex/html/Accordion.as | 7 + .../src/main/flex/org/apache/flex/html/Span.as | 51 +- .../org/apache/flex/html/beads/AccordionView.as | 14 +- .../org/apache/flex/html/beads/InnerHTML.as | 98 ++++ .../HTML/src/main/resources/basic-manifest.xml | 2 + .../flex/org/apache/flex/mdl/LayoutTitle.as | 7 +- .../flex/mdl/beads/ListItemPrimaryContent.as | 85 ++++ .../flex/mdl/beads/ListItemSecondaryAction.as | 85 ++++ .../flex/mdl/beads/ListItemSecondaryContent.as | 85 ++++ .../flex/mdl/beads/ListItemSecondaryInfo.as | 85 ++++ .../apache/flex/mdl/beads/ListItemSubTitle.as | 85 ++++ .../apache/flex/mdl/beads/ListItemTextBody.as | 85 ++++ .../mdl/beads/materialIcons/MaterialIconAdd.as | 26 +- .../beads/materialIcons/MaterialIconCancel.as | 26 +- .../beads/materialIcons/MaterialIconEvent.as | 52 ++ .../beads/materialIcons/MaterialIconPerson.as | 52 ++ .../beads/materialIcons/MaterialIconShare.as | 52 ++ .../mdl/beads/materialIcons/MaterialIconStar.as | 52 ++ .../beads/materialIcons/MaterialIconsType.as | 4 + .../flex/mdl/itemRenderers/ListItemRenderer.as | 119 +++-- .../flex/mdl/supportClasses/MaterialIconBase.as | 161 ++++++- .../src/main/resources/mdl-manifest.xml | 10 + 44 files changed, 2331 insertions(+), 224 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3a741f1b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml ----------------------------------------------------------------------
