This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch feature/vivid in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 95f046a61a3dfe505cc7a89d65653b5fc07cc68d Merge: a37cf19 ad1f5fc Author: Alex Harui <aha...@apache.org> AuthorDate: Mon Feb 19 08:54:47 2018 -0800 Merge branch 'feature/vivid' of https://github.com/apache/royale-asjs into feature/vivid LICENSE | 2 +- .../ASDoc/src/main/config/compile-app-config.xml | 4 + examples/royale/ASDoc/src/main/royale/ASDoc.mxml | 1 + .../royale/ASDoc/src/main/royale/ASDocClass.as | 115 ++++++++++ .../ValueObject.as => ASDocClassAccessor.as} | 35 +-- .../ValueObject.as => ASDocClassAttribute.as} | 42 ++-- .../ASDoc/src/main/royale/ASDocClassEvents.as | 115 ++++++++++ .../ASDoc/src/main/royale/ASDocClassFunction.as | 90 ++++++++ .../ValueObject.as => ASDocClassMembers.as} | 35 +-- .../ValueObject.as => ASDocClassTags.as} | 46 ++-- .../ASDoc/src/main/royale/EventDetailRenderer.mxml | 11 +- .../src/main/royale/EventSummaryRenderer.mxml | 12 +- .../src/main/royale/MethodDetailRenderer.mxml | 18 +- .../src/main/royale/MethodSummaryRenderer.mxml | 18 +- .../src/main/royale/PropertyDetailRenderer.mxml | 14 +- .../ASDoc/src/main/royale/SummaryRenderer.mxml | 16 +- .../ASDoc/src/main/royale/models/ASDocModel.as | 78 ++++--- .../ASDoc/src/main/royale/valueObjects/DataVO.as | 50 ---- examples/royale/JSON2ASVO/JSON2ASVO-app.xml | 252 +++++++++++++++++++++ .../ValueObject.as => JSON2ASVO/asconfig.json} | 28 +-- examples/royale/JSON2ASVO/build.xml | 89 ++++++++ examples/royale/JSON2ASVO/pom.xml | 90 ++++++++ .../src/main/royale/JSON2ASVO.mxml} | 37 +-- .../JSON2ASVO/src/main/royale/MyInitialView.mxml | 251 ++++++++++++++++++++ .../royale/RoyaleWebsite/RoyaleWebsite.as3proj | 91 ++++++++ examples/royale/VividExample/build.xml | 68 ++++++ .../src/main/config/compile-app-config.xml | 6 +- frameworks/build.xml | 6 + frameworks/js/projects/VividJS/build.xml | 125 ++++++++++ .../VividJS/src/main/config/compile-js-config.xml | 97 ++++++++ .../Basic/src/main/resources/basic-manifest.xml | 1 + .../{VScrollViewport.as => HScrollViewport.as} | 150 ++++++------ .../royale/html/supportClasses/VScrollViewport.as | 24 +- .../royale/org/apache/royale/states/AddItems.as | 89 +++++++- .../org/apache/royale/states/ItemAndDescriptor.as | 22 +- .../main/royale/org/apache/royale/states/State.as | 34 ++- .../src/main/resources/basic-manifest.xml | 1 + .../apache/royale/reflection/beads/JSONReviver.as | 140 ++++++++++++ frameworks/projects/Vivid/build.xml | 130 +++++++++++ .../Vivid/src/main/config/compile-swf-config.xml | 105 +++++++++ frameworks/projects/VividBlueTheme/build.xml | 133 +++++++++++ .../src/main/config/compile-swf-config.xml | 91 ++++++++ frameworks/projects/XML/src/main/royale/XML.as | 2 + frameworks/projects/XML/src/main/royale/XMLList.as | 2 +- frameworks/projects/pom.xml | 2 + manualtests/XMLTest/src/MyInitialView.mxml | 8 +- npm/cli/README.md | 19 ++ 47 files changed, 2438 insertions(+), 357 deletions(-) -- To stop receiving notification emails like this one, please contact aha...@apache.org.