Merge branch 'develop' into feature/strand-work * develop: (88 commits) Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Condition not necessary Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Condition not necessary Only layout if visible LayoutOnShow bead must be used to trigger layout when visible is set to true. LayoutOnShow added to Express Container Not used Made finding errorNS more efficient I think this fixed MS browsers Better XML errors Fix MDLExample FLEX-35347 - Add property "value" to CheckBox which will store additional information Update MDLExample with new feature Split COMPILE::SWF and COMPILE::JS into separate functions. Use setDisplayStyleForLayout() for compatibility with the visible property. - Switch FlexTeamPage_MDL example to compile JSFlex - Clean up native TeamPage try to not run SWF test if target is JS only Fix config of MDLExample used for Ant build Strikethru needs this too. Added special cursor for drag and drop operation. Removed extra IF statement. The Text Engine needs to specify base offset for adornments FontMetrics should not be scaled This doesnât compile correctly. Reverting. Make MDLExample compiled to JS only since MDL library do not have swf part ...
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2df19a45 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2df19a45 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2df19a45 Branch: refs/heads/feature/strand-work Commit: 2df19a45bdbd2d0fb359ad1e4783f383be0c644e Parents: 41ac35e 42db766 Author: Harbs <[email protected]> Authored: Mon Aug 7 19:01:43 2017 +0300 Committer: Harbs <[email protected]> Committed: Mon Aug 7 19:01:43 2017 +0300 ---------------------------------------------------------------------- examples/build.xml | 3 + .../flexjs/examples/tests/ExampleBuildTest.java | 3 + .../ASDoc/src/main/flex/ASDocMainView.mxml | 12 +- .../src/main/flex/MyInitialView.mxml | 12 +- examples/flexjs/DragAndDropExample/build.xml | 66 ++++ examples/flexjs/DragAndDropExample/pom.xml | 77 +++++ .../src/main/flex/DragAndDropExample.mxml | 36 ++ .../src/main/flex/MyInitialView.mxml | 95 ++++++ .../src/main/flex/models/ProductsModel.as | 54 +++ .../src/main/flex/products/Product.as | 43 +++ .../main/flex/products/ProductItemRenderer.as | 66 ++++ .../src/main/resources/assets/smallbluerect.jpg | Bin 0 -> 13500 bytes .../main/resources/assets/smallgreenrect.jpg | Bin 0 -> 13542 bytes .../main/resources/assets/smallorangerect.gif | Bin 0 -> 821 bytes .../main/resources/assets/smallorangerect.jpg | Bin 0 -> 13571 bytes .../main/resources/assets/smallpurplerect.jpg | Bin 0 -> 13517 bytes .../src/main/resources/assets/smallredrect.jpg | Bin 0 -> 13477 bytes .../main/resources/assets/smallyellowrect.jpg | Bin 0 -> 13598 bytes examples/flexjs/FlexTeamPage_MDL/pom.xml | 32 +- examples/flexjs/MDLExample/pom.xml | 17 +- .../src/main/config/compile-app-config.xml | 2 +- .../flexjs/MDLExample/src/main/flex/Menus.mxml | 12 +- .../MDLExample/src/main/flex/Toggles.mxml | 13 +- examples/flexjs/TeamPage/pom.xml | 15 - examples/flexjs/pom.xml | 3 + .../org/apache/flex/core/HTMLElementWrapper.as | 26 +- .../flex/org/apache/flex/core/LayoutBase.as | 2 + .../main/flex/org/apache/flex/core/UIBase.as | 47 ++- .../main/flex/org/apache/flex/css2/Cursors.as | 1 - .../main/flex/org/apache/flex/html/Container.as | 4 + .../flex/html/beads/AccordionCollapseBead.as | 6 +- .../html/beads/DataProviderChangeNotifier.as | 38 ++- .../DataProviderCollectionChangeNotifier.as | 12 +- .../beads/DataProviderItemsChangeNotifier.as | 12 +- .../flex/org/apache/flex/html/beads/ListView.as | 70 ++-- .../org/apache/flex/html/beads/PanelView.as | 7 + .../org/apache/flex/html/beads/ScrollBarView.as | 3 +- .../beads/SimpleDataProviderChangeNotifier.as | 3 +- .../apache/flex/html/beads/TitleBarView.mxml | 2 +- .../flex/html/beads/layouts/DataGridLayout.as | 10 +- .../beads/layouts/DataGridPercentageLayout.as | 12 +- .../html/beads/layouts/HorizontalFlexLayout.as | 298 ++++++++-------- .../layouts/OneFlexibleChildHorizontalLayout.as | 6 +- .../layouts/OneFlexibleChildVerticalLayout.as | 6 +- .../flex/html/beads/layouts/TileLayout.as | 4 +- .../html/beads/layouts/VerticalFlexLayout.as | 288 ++++++++-------- .../html/supportClasses/OverflowViewport.as | 129 +++++++ .../Basic/src/main/resources/basic-manifest.xml | 4 +- .../Basic/src/main/resources/defaults.css | 1 + .../projects/Core/src/main/flex/CoreClasses.as | 5 +- .../flex/org/apache/flex/core/ElementWrapper.as | 7 +- .../org/apache/flex/debugging/throwError.as | 43 +++ .../flex/org/apache/flex/events/BrowserEvent.as | 47 +-- .../org/apache/flex/events/ElementEvents.as | 6 +- .../org/apache/flex/events/IBrowserEvent.as | 35 ++ .../org/apache/flex/events/KeyboardEvent.as | 139 +++++++- .../flex/org/apache/flex/events/MouseEvent.as | 337 +++++++++++++++++-- .../org/apache/flex/events/getTargetWrapper.as | 32 ++ .../flex/events/utils/KeyboardEventConverter.as | 22 +- .../flex/events/utils/MouseEventConverter.as | 28 +- .../src/main/config/compile-swf-config.xml | 1 + .../DragDrop/src/main/flex/DragDropClasses.as | 2 + .../flex/org/apache/flex/events/DragEvent.as | 107 ++++-- .../org/apache/flex/events/DragEventBase.as | 1 + .../html/beads/SingleSelectionDragImageBead.as | 137 ++++++++ .../html/beads/SingleSelectionDragSourceBead.as | 116 ++++--- .../beads/SingleSelectionDropIndicatorBead.as | 111 ++++++ .../html/beads/SingleSelectionDropTargetBead.as | 131 +++++-- .../beads/controllers/DragMouseController.as | 57 ++-- .../beads/controllers/DropMouseController.as | 68 ++-- .../src/main/resources/basic-manifest.xml | 2 + .../flex/org/apache/flex/express/Container.as | 9 +- .../Language/src/main/flex/LanguageClasses.as | 3 + .../org/apache/flex/language/string/match.as | 33 ++ .../org/apache/flex/language/string/search.as | 33 ++ .../main/flex/org/apache/flex/utils/Language.as | 2 +- .../main/flex/org/apache/flex/mdl/CheckBox.as | 26 +- .../src/main/flex/org/apache/flex/mdl/Menu.as | 16 +- .../flex/mdl/itemRenderers/MenuItemRenderer.as | 5 + .../src/main/resources/defaults.css | 6 + frameworks/projects/TLF/pom.xml | 10 + .../flex/textLayout/compose/TextLineRecycler.as | 2 +- .../textLayout/compose/utils/AdornmentUtils.as | 4 +- .../textLayout/container/ContainerController.as | 2 +- .../container/TextContainerManager.as | 8 - .../conversion/BaseTextLayoutImporter.as | 6 +- .../textLayout/conversion/TextLayoutImporter.as | 6 +- .../flex/textLayout/edit/SelectionManager.as | 63 ++-- .../textLayout/elements/FlowGroupElement.as | 14 +- .../flex/textLayout/elements/FlowLeafElement.as | 14 +- .../textLayout/elements/ParagraphElement.as | 2 +- .../flex/textLayout/elements/SpanElement.as | 4 +- .../flex/textLayout/elements/TableElement.as | 8 + .../elements/utils/GeometricElementUtils.as | 7 + .../flex/textLayout/factory/TLFFactory.as | 9 +- .../apache/flex/textLayout/utils/FactoryUtil.as | 14 - .../apache/flex/text/engine/ElementFormat.as | 9 +- .../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 | 250 +++++++++----- .../projects/XML/src/main/flex/XMLClasses.as | 2 + .../projects/XML/src/main/flex/XMLList.as | 70 +++- .../main/flex/org/apache/flex/language/toXML.as | 51 +++ .../flex/org/apache/flex/language/toXMLList.as | 51 +++ manualtests/BubbleTest/build.xml | 73 ++++ manualtests/BubbleTest/src/BubbleTest.mxml | 135 ++++++++ manualtests/ContainerTest/build.xml | 3 +- .../src/products/ProductItemRenderer.as | 2 +- manualtests/DataBindingTestbed/build.xml | 5 +- manualtests/XMLTest/build.xml | 1 + manualtests/XMLTest/src/MyInitialView.mxml | 3 + 112 files changed, 3064 insertions(+), 918 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Core/src/main/flex/CoreClasses.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as ----------------------------------------------------------------------
