This is an automated email from the ASF dual-hosted git repository.

harbs pushed a commit to branch feature/router
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit cc7b2d5401b42dd8d58cda0c296d3c5bf51f7de8
Merge: 204a154 d536238
Author: Harbs <ha...@in-tools.com>
AuthorDate: Fri Jan 31 14:26:32 2020 +0200

    Merge branch 'develop' into feature/router

 examples/jewel/pom.xml                             | 188 +++++
 .../jewel/todomvc/asconfig.json                    |  40 +-
 examples/jewel/todomvc/build.xml                   |  56 ++
 examples/jewel/todomvc/pom.xml                     | 109 +++
 .../todomvc/src/main/config/compile-app-config.xml |  46 +
 .../src/main/resources/todomvc-index-template.html |  30 +
 .../todomvc/src/main/resources/todomvc-styles.css  | 345 ++++++++
 examples/jewel/todomvc/src/main/royale/App.mxml    |  54 ++
 .../jewel/todomvc/controllers/TodoController.as    | 234 ++++++
 .../main/royale/jewel/todomvc/events/TodoEvent.as  |  69 ++
 .../main/royale/jewel/todomvc/models/TodoModel.as  | 157 ++++
 .../jewel/todomvc/renderers/TodoItemRenderer.mxml  | 139 +++
 .../royale/jewel/todomvc/views/TodoFooter.mxml     | 103 +++
 .../royale/jewel/todomvc/views/TodoHeader.mxml     |  75 ++
 .../jewel/todomvc/views/TodoListSection.mxml       | 112 +++
 .../src/main/royale/jewel/todomvc/vos/TodoVO.as    |  50 +-
 examples/jewel/todomvc/todomvc.as3proj             | 115 +++
 examples/pom.xml                                   |   1 +
 .../ASDoc/src/main/config/asdoc-swf-config.xml     |   1 +
 .../royale/itemRenderers/IconListItemRenderer.mxml |   7 +
 .../Basic/src/main/resources/basic-manifest.xml    |   7 +
 .../apache/royale/core/StyledMXMLItemRenderer.as   |   4 +-
 .../org/apache/royale/display/UIGraphicsBase.as    |  63 ++
 .../apache/royale/html/accessories/ToolTipBead.as  |  46 +-
 .../accessories/ToolTipRemovalWhenItemRemoved.as   |  80 ++
 .../CollectionChangeUpdateForArrayListData.as      |   5 +-
 .../org/apache/royale/html/beads/DateFieldView.as  |   5 +-
 .../royale/html/beads/models/DateChooserModel.as   |  22 +-
 .../models/MultiSelectionCollectionViewModel.as    |   4 +-
 .../royale/html/supportClasses/MXMLItemRenderer.as |   9 +-
 .../html/supportClasses/MXMLStatesItemRenderer.as  | 184 ++++
 .../projects/Core/src/main/royale/CoreClasses.as   |   1 +
 .../org/apache/royale/core/IDateChooserModel.as    |  14 +
 .../royale/org/apache/royale/core/IToolTipBead.as} |  35 +-
 .../main/royale/org/apache/royale/geom/Matrix.as   |  33 +
 .../html/beads/controllers/DragMouseController.as  |  22 +-
 .../Graphics/src/main/royale/GraphicsClasses.as    |  21 +-
 .../royale/org/apache/royale/display/BitmapData.as | 358 ++++++++
 .../royale/org/apache/royale/display/CapsStyle.as  |  46 +
 .../royale/org/apache/royale/display/Graphics.as   | 931 +++++++++++++++++++++
 .../apache/royale/display/GraphicsBitmapFill.as    |  97 +++
 .../org/apache/royale/display/GraphicsEndFill.as   |  40 +
 .../apache/royale/display/GraphicsGradientFill.as  | 256 ++++++
 .../org/apache/royale/display/GraphicsSolidFill.as |  67 ++
 .../org/apache/royale/display/GraphicsStroke.as    | 169 ++++
 .../org/apache/royale/display/IGraphicsData.as     |  29 +
 .../org/apache/royale/display/IGraphicsFill.as     |  35 +
 .../org/apache/royale/display/IGraphicsStroke.as   |  31 +
 .../org/apache/royale/display/IGraphicsTarget.as   |  42 +
 .../apache/royale/display/InterpolationMethod.as   |  46 +
 .../apache/royale/display/JPEGEncoderOptions.as    |  40 +
 .../royale/org/apache/royale/display/JointStyle.as |  46 +
 .../org/apache/royale/display/LineScaleMode.as     |  52 ++
 .../org/apache/royale/display/PNGEncoderOptions.as |  41 +
 .../royale/display/js/JSRuntimeGraphicsStore.as    | 111 +++
 .../apache/royale/display/js/createGraphicsSVG.as  |  37 +
 .../apache/royale/display/js/nonNullParamError.as  |  30 +
 .../HTML/src/main/resources/html-manifest.xml      |   3 +
 .../org/apache/royale/html/elements/Footer.as}     |  63 +-
 .../org/apache/royale/html/elements/Header.as}     |  63 +-
 .../org/apache/royale/html/elements/Section.as}    |  63 +-
 .../projects/Jewel/src/main/resources/defaults.css |   2 +-
 .../royale/org/apache/royale/jewel/IconButton.as   |  13 +-
 .../royale/org/apache/royale/jewel/TextInput.as    |   2 +-
 .../royale/org/apache/royale/jewel/ToggleButton.as |  11 +-
 .../apache/royale/jewel/beads/controls/ToolTip.as  |  39 +-
 .../royale/jewel/beads/views/DataGridView.as       |   2 +-
 .../supportClasses/textinput/TextInputBase.as      |  21 +-
 .../Jewel/src/main/sass/components/_layout.sass    |   2 +-
 .../MXRoyale/src/main/royale/mx/geom/Matrix.as     |   3 -
 .../src/main/royale/mx/utils/ObjectUtil.as         |   2 -
 71 files changed, 5063 insertions(+), 216 deletions(-)

diff --cc frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 4fd27c9,d1e5220..0f01dc0
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@@ -273,13 -278,8 +278,15 @@@
      <component id="ModalDisplay" 
class="org.apache.royale.html.beads.plugin.ModalDisplay"/>
      <component id="ModalOverlay" 
class="org.apache.royale.html.beads.plugin.ModalOverlay"/>
  
 +    <component id="ComponentRoute" 
class="org.apache.royale.routing.ComponentRoute"/>
 +    <component id="LinkInterceptor" 
class="org.apache.royale.routing.LinkInterceptor"/>
 +    <component id="ParameterRoute" 
class="org.apache.royale.routing.ParameterRoute"/>
 +    <component id="RouteToComponent" 
class="org.apache.royale.routing.RouteToComponent"/>
 +    <component id="RouteToParameters" 
class="org.apache.royale.routing.RouteToParameters"/>
 +    <component id="RouteToState" 
class="org.apache.royale.routing.RouteToState"/>
 +    <component id="SetRouteTitle" 
class="org.apache.royale.routing.SetRouteTitle"/>
      <component id="Router" class="org.apache.royale.routing.Router"/>
  
+     <component id="UIGraphicsBase" 
class="org.apache.royale.display.UIGraphicsBase"/>
+ 
  </componentPackage>

Reply via email to