This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 94fd8287e7a6e556e302515e6fb7462ca68e632e Merge: edd6198 8417457 Author: Erik de Bruin <[email protected]> AuthorDate: Mon Dec 11 09:07:38 2017 +0100 Merge branch 'develop' into as2wasm Signed-off-by: Erik de Bruin <[email protected]> # Conflicts: # build.xml .gitignore | 1 + ApproveRoyale.xml | 166 ++++++----- NOTICE | 4 + README.md | 8 +- .../src/main/resources/flex-sdk-description.xml | 2 +- .../asconfig.json} | 23 +- examples/royale/HTMLElements/build.xml | 54 ++++ examples/royale/HTMLElements/pom.xml | 58 ++++ .../HTMLElements/src/main/royale/HTMLElements.mxml | 53 ++++ .../ListExample/src/main/royale/MyInitialView.mxml | 39 ++- .../src/main/royale/models/ProductsModel.as | 14 +- .../src/main/royale/BlogTemplate.mxml | 95 ++++--- .../royale/MDLExample/src/main/royale/Badges.mxml | 17 +- .../royale/MDLExample/src/main/royale/Cards.mxml | 13 +- .../royale/MDLExample/src/main/royale/Grids.mxml | 47 +-- .../royale/MDLExample/src/main/royale/Tabs.mxml | 39 +-- .../MDLExample/src/main/royale/TestDialog.mxml | 3 +- .../ActorNameAndIconListItemRenderer.mxml | 5 +- .../itemRenderers/ActorNameListItemRenderer.mxml | 5 +- .../AvatarAndActionListItemRenderer.mxml | 9 +- .../AvatarAndActionThreeLineListItemRenderer.mxml | 19 +- .../AvatarAndActionTwoLineListItemRenderer.mxml | 23 +- .../itemRenderers/CustomListItemRenderer.mxml | 5 +- .../FooterMiniLinkListItemRenderer.mxml | 3 +- .../royale/itemRenderers/MemberItemRenderer.mxml | 3 +- .../src/main/royale/MemberItemRenderer.mxml | 2 +- .../royale/sample/todo/models/TodoListModel.as | 7 +- .../sample/todo/renderers/TodoItemRenderer.mxml | 12 +- .../src/main/royale/sample/todo/vo/ToDoVO.as} | 19 +- frameworks/asdoc-config.xml | 4 +- frameworks/build.xml | 2 +- frameworks/downloads.xml | 2 +- frameworks/flex-config-template.xml | 4 +- frameworks/js/build.xml | 5 + .../src/main/config/compile-js-config.xml | 5 + frameworks/js/projects/HTMLJS/build.xml | 1 + .../HTMLJS/src/main/config/compile-js-config.xml | 5 + .../Basic/src/main/resources/basic-manifest.xml | 3 + .../projects/Basic/src/main/royale/BasicClasses.as | 13 +- .../royale/org/apache/royale/core/ContainerBase.as | 16 +- .../org/apache/royale/core/DataContainerBase.as | 21 +- .../royale/org/apache/royale/core/GroupBase.as | 20 +- .../royale/org/apache/royale/core/LayoutBase.as | 12 +- .../royale/org/apache/royale/html/CSSCheckBox.as | 5 +- .../main/royale/org/apache/royale/html/CheckBox.as | 4 +- .../main/royale/org/apache/royale/html/HTMLText.as | 0 .../royale/org/apache/royale/html/RadioButton.as | 26 +- .../org/apache/royale/html/ToggleTextButton.as | 3 +- .../beads/DataItemRendererFactoryForArrayList.as | 5 +- .../DataItemRendererFactoryForHierarchicalData.as | 8 +- .../royale/html/beads/DisableChildrenBead.as | 2 +- .../DynamicItemsRendererFactoryForArrayListData.as | 76 +++-- .../DynamicRemoveItemRendererForArrayListData.as | 136 +++++++++ .../html/beads/SingleSelectionContainerBead.as | 316 +++++++++++++++++++++ .../ListSingleSelectionMouseController.as | 1 + .../html/beads/layouts/RemovableBasicLayout.as | 102 +++---- .../apache/royale/html/beads/layouts/TileLayout.as | 8 +- .../apache/royale/html/supportClasses/DataGroup.as | 19 ++ .../main/royale/org/apache/royale/svg/Circle.as | 4 +- .../main/royale/org/apache/royale/svg/Ellipse.as | 4 +- .../org/apache/royale/svg/GraphicContainer.as | 7 +- .../royale/org/apache/royale/svg/GraphicShape.as | 74 +++-- .../src/main/royale/org/apache/royale/svg/Path.as | 5 +- .../src/main/royale/org/apache/royale/svg/Rect.as | 6 +- .../src/main/royale/org/apache/royale/svg/Text.as | 4 +- .../projects/Basic/src/test/royale/build.xml | 2 +- .../royale/charts/optimized/SVGChartDataGroup.as | 20 +- .../org/apache/royale/collections/ArrayList.as | 5 + .../projects/Core/src/main/royale/CoreClasses.as | 2 + .../org/apache/royale/core/AllCSSValuesImpl.as | 4 +- .../org/apache/royale/core/IItemRendererParent.as | 1 + .../royale/org/apache/royale/core/ISelectable.as | 32 ++- .../org/apache/royale/core/SimpleCSSValuesImpl.as | 4 +- .../org/apache/royale/events/CollectionEvent.as | 12 +- .../royale/org/apache/royale/events/ValueEvent.as | 6 +- .../royale/org/apache/royale/utils/EffectTimer.as | 4 +- .../org/apache/royale/utils/array/rangeCheck.as} | 20 +- frameworks/projects/Core/src/test/royale/build.xml | 2 +- .../test/royale/flexUnitTests/ArrayUtilsTest.as | 51 ++-- .../src/test/royale/flexUnitTests/CoreTester.as | 1 + .../src/main/config/compile-swf-config.xml | 1 + .../Graphics/src/main/resources/svg-manifest.xml | 1 + .../Graphics/src/main/royale/GraphicsClasses.as | 1 - .../org/apache/royale/svg/DisableClipBead.as | 126 ++++++++ frameworks/projects/HTML/asconfig.json | 4 +- frameworks/projects/HTML/build.xml | 1 + frameworks/projects/HTML/pom.xml | 5 + .../HTML/src/main/config/compile-swf-config.xml | 5 + .../HTML/src/main/resources/basic-manifest.xml | 26 -- .../projects/HTML/src/main/resources/defaults.css | 4 +- .../HTML/src/main/resources/html-manifest.xml | 69 +++++ .../HTML/src/main/resources/svg-manifest.xml | 32 --- .../src/main/royale/org/apache/royale/html/A.as | 120 -------- .../src/main/royale/org/apache/royale/html/Div.as | 84 ------ .../src/main/royale/org/apache/royale/html/H2.as | 106 ------- .../src/main/royale/org/apache/royale/html/H3.as | 106 ------- .../src/main/royale/org/apache/royale/html/H5.as | 106 ------- .../src/main/royale/org/apache/royale/html/H6.as | 106 ------- .../src/main/royale/org/apache/royale/html/I.as | 106 ------- .../org/apache/royale/html/NodeElementBase.as} | 48 +++- .../src/main/royale/org/apache/royale/html/P.as | 118 -------- .../src/main/royale/org/apache/royale/html/PRE.as | 118 -------- .../src/main/royale/org/apache/royale/html/Span.as | 94 ------ .../main/royale/org/apache/royale/html/TextNode.as | 32 +-- .../html/{Th.as => TextNodeContainerBase.as} | 81 +++--- .../org/apache/royale/html/beads/InnerHTML.as | 4 +- .../apache/royale/html/{Td.as => elements/A.as} | 48 ++-- .../royale/html/{Select.as => elements/B.as} | 17 +- .../org/apache/royale/html/elements/Button.as | 224 +++++++++++++++ .../royale/html/{Select.as => elements/Caption.as} | 17 +- .../apache/royale/html/{Ul.as => elements/Code.as} | 21 +- .../royale/html/{Option.as => elements/Col.as} | 54 ++-- .../royale/html/{H1.as => elements/Colgroup.as} | 56 ++-- .../apache/royale/html/{Ul.as => elements/Div.as} | 23 +- .../royale/html/{Select.as => elements/Em.as} | 17 +- .../royale/html/{Input.as => elements/Form.as} | 117 +++++--- .../apache/royale/html/{Ul.as => elements/H1.as} | 18 +- .../apache/royale/html/{Ol.as => elements/H2.as} | 18 +- .../apache/royale/html/{Ul.as => elements/H3.as} | 18 +- .../apache/royale/html/{Ul.as => elements/H4.as} | 18 +- .../apache/royale/html/{Ul.as => elements/H5.as} | 18 +- .../apache/royale/html/{Ul.as => elements/H6.as} | 18 +- .../apache/royale/html/{Ul.as => elements/Hr.as} | 16 +- .../royale/html/{Select.as => elements/I.as} | 17 +- .../royale/html/{Input.as => elements/Img.as} | 92 +++--- .../org/apache/royale/html/elements/Input.as | 258 +++++++++++++++++ .../royale/html/{H4.as => elements/Label.as} | 54 ++-- .../org/apache/royale/html/{ => elements}/Li.as | 11 +- .../org/apache/royale/html/{ => elements}/Ol.as | 14 +- .../royale/html/{Select.as => elements/Option.as} | 17 +- .../apache/royale/html/{Ul.as => elements/P.as} | 20 +- .../apache/royale/html/{Ul.as => elements/Pre.as} | 20 +- .../royale/html/{Select.as => elements/S.as} | 17 +- .../apache/royale/html/{ => elements}/Select.as | 9 +- .../royale/html/{Select.as => elements/Small.as} | 17 +- .../apache/royale/html/{Ul.as => elements/Span.as} | 16 +- .../royale/html/{Select.as => elements/Strong.as} | 17 +- .../royale/html/{Ul.as => elements/Table.as} | 16 +- .../royale/html/{Ul.as => elements/Tbody.as} | 16 +- .../apache/royale/html/{Ol.as => elements/Td.as} | 16 +- .../org/apache/royale/html/elements/Textarea.as | 223 +++++++++++++++ .../royale/html/{Ul.as => elements/Tfoot.as} | 16 +- .../apache/royale/html/{Ul.as => elements/Th.as} | 16 +- .../royale/html/{Ul.as => elements/Thead.as} | 16 +- .../apache/royale/html/{Ul.as => elements/Tr.as} | 16 +- .../royale/html/{Select.as => elements/U.as} | 17 +- .../org/apache/royale/html/{ => elements}/Ul.as | 8 +- frameworks/projects/HTML/src/test/royale/build.xml | 2 +- .../src/main/resources/mdl-manifest.xml | 1 + .../royale/org/apache/royale/mdl/CardTitleText.as | 2 +- .../main/royale/org/apache/royale/mdl/Dialog.as | 4 +- .../royale/org/apache/royale/mdl/DialogTitle.as | 2 +- .../royale/org/apache/royale/mdl/DropDownList.as | 2 +- .../royale/org/apache/royale/mdl/FooterHeading.as | 2 +- .../royale/org/apache/royale/mdl/FooterLogo.as | 2 +- .../royale/org/apache/royale/mdl/LayoutTitle.as | 2 +- .../royale/org/apache/royale/mdl/NavigationLink.as | 2 +- .../royale/org/apache/royale/mdl/TabBarButton.as | 2 +- .../org/apache/royale/mdl/beads/ContactChip.as | 2 +- .../royale/mdl/beads/views/DropDownListView.as | 4 +- .../org/apache/royale/mdl/beads/views/TableView.as | 110 +------ .../mdl/itemRenderers/DropDownListItemRenderer.as | 2 +- .../itemRenderers/FooterLinkItemMouseRenderer.as | 3 +- .../NavigationLinkItemMouseRenderer.as | 3 +- .../mdl/itemRenderers/TableRowItemRenderer.as | 19 +- .../TableRowItemSingleSelectionMouseRenderer.as} | 73 ++--- .../org/apache/royale/mobile/ViewManagerBase.as | 2 +- .../royale/mobile/beads/TabbedViewManagerView.as | 9 +- frameworks/projects/TLF/build.xml | 1 + .../apache/royale/textLayout/edit/EditManager.as | 7 +- .../royale/textLayout/elements/GlobalSettings.as | 50 ++-- .../royale/textLayout/elements/ListElement.as | 124 ++++---- .../royale/textLayout/elements/SpanElement.as | 2 +- .../org/apache/royale/text/html/HTMLTextFactory.as | 2 +- .../org/apache/royale/text/html/TextBlock.as | 2 +- .../royale/org/apache/royale/text/html/TextLine.as | 2 +- frameworks/royale-config-template.xml | 4 +- ide/IDEA/intellij-config.xml | 4 +- .../src/main/royale/flexUnitTests/CoreTester.as | 3 +- .../{CoreTester.as => core/MD5Test.as} | 50 ++-- releasemgr/LICENSE | 215 ++++++++++++++ releasemgr/NOTICE | 18 ++ releasemgr/README | 191 +++++++++++++ releasemgr/RELEASE_NOTES | 20 ++ 184 files changed, 3456 insertions(+), 2492 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
