royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject [royale-asjs] 01/02: Merge branch 'develop' into CollectionData
Date Fri, 05 Jan 2018 16:30:14 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 44b90fd8befb93be1ac60f2568121b82ff3e75a6
Merge: 8e54a22 87d5891
Author: Peter Ent <pent@apache.org>
AuthorDate: Thu Jan 4 15:23:50 2018 -0500

    Merge branch 'develop' into CollectionData
    
    * develop: (44 commits)
      asjs seemed to work as well
      compiler script appears to work now.  next up is typedefs
      Fix path for created js only file description
      more improvements to release script
      make_branches seemed to work without pushing
      make_branches worked on dryrun
      Fixes issue with retaining selection and rollover using the Dynamic beads for ArrayList.
      Create js only description in temp folder before zipping
      Change place of cration for JS-only description in royale-asjs build
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare branch release/0.9.0
      Create jsonly description in case of asjs (SWF + JS) build
      fix up rc script
      refactor rc script to try to pull sources from maven staging
      fix up scm info
      more fixes for release script
      Implement set positioner on IUIBase implementers
      MaskBead now changes svg element into a mask definition instead of attempting to draw
mask using path.
      Bring back original state for flex-sdk-description file
      Add output-targets to sdk-description file
      ...

 .../main/resources/mdl-styles.css => GIT-TEST.txt  |  13 +-
 archetypes/pom.xml                                 |   4 +-
 .../royale-simple-application-archetype/pom.xml    |   4 +-
 .../pom.xml                                        |   4 +-
 .../pom.xml                                        |   4 +-
 archetypes/royale-simple-library-archetype/pom.xml |   4 +-
 archetypes/royale-simple-typedef-archetype/pom.xml |   4 +-
 build.xml                                          |  85 ++-
 .../src/main/resources/flex-sdk-description.xml    |   4 +-
 .../src/main/resources/flexjs-sdk-description.xml  |  32 -
 ...-description.xml => royale-sdk-description.xml} |   0
 examples/build_example.xml                         |   7 +
 .../MDLDynamicTableExample/src/MainView.mxml       |  11 +-
 .../itemRenderers/CustomTableRowItemRenderer.mxml  |   4 +-
 .../src/main/resources/mdl-styles.css              |   2 +-
 .../src/main/royale/views/InitialView.mxml         |   5 +-
 .../MDLExample/src/main/royale/TextFields.mxml     |   4 +-
 frameworks/fontsrc/pom.xml                         |   4 +-
 frameworks/pom.xml                                 |   4 +-
 frameworks/projects/Basic/pom.xml                  |  20 +-
 .../Basic/src/main/resources/basic-manifest.xml    |   5 +
 .../projects/Basic/src/main/royale/BasicClasses.as |   1 -
 .../beads/DataItemRendererFactoryForArrayList.as   |  11 +-
 ...s => DynamicAddItemRendererForArrayListData.as} |  93 ++-
 .../DynamicItemsRendererFactoryForArrayListData.as |  13 +-
 ...RemoveAllByNullItemRendererForArrayListData.as} |  44 +-
 ...DynamicRemoveAllItemRendererForArrayListData.as |   6 +-
 .../DynamicRemoveItemRendererForArrayListData.as   |  12 +-
 ...> DynamicUpdateItemRendererForArrayListData.as} |  42 +-
 .../org/apache/royale/html/beads/TextOverflow.as   |  87 +++
 .../org/apache/royale/html/beads/ThrottleBead.as   | 122 ++++
 .../html/supportClasses/StringItemRenderer.as      |   4 -
 frameworks/projects/Binding/pom.xml                |   8 +-
 frameworks/projects/Charts/pom.xml                 |  24 +-
 frameworks/projects/Collections/pom.xml            |   8 +-
 frameworks/projects/Core/pom.xml                   |   4 +-
 .../main/royale/org/apache/royale/core/IUIBase.as  |  13 +
 .../royale/org/apache/royale/geom/Rectangle.as     |   4 +-
 .../royale/utils/loadBeadFromValuesManager.as      |   2 +-
 frameworks/projects/CreateJS/pom.xml               |  20 +-
 frameworks/projects/DragDrop/pom.xml               |  12 +-
 frameworks/projects/Effects/pom.xml                |  12 +-
 .../org/apache/royale/utils/MockContentView.as     |   5 +
 .../org/apache/royale/utils/MockLayoutChild.as     |   5 +
 .../org/apache/royale/utils/MockLayoutParent.as    |   6 +
 frameworks/projects/Express/pom.xml                |  28 +-
 frameworks/projects/Flat/pom.xml                   |  22 +-
 frameworks/projects/FontAwesome/pom.xml            |  24 +-
 frameworks/projects/Formatters/pom.xml             |  12 +-
 frameworks/projects/GoogleMaps/pom.xml             |  12 +-
 frameworks/projects/Graphics/pom.xml               |   8 +-
 .../Graphics/src/main/resources/svg-manifest.xml   |   1 +
 .../main/royale/org/apache/royale/svg/MaskBead.as  | 134 ++++
 frameworks/projects/HTML/pom.xml                   |  24 +-
 frameworks/projects/HTML5/pom.xml                  |  12 +-
 frameworks/projects/JQuery/pom.xml                 |  12 +-
 frameworks/projects/Language/pom.xml               |   4 +-
 frameworks/projects/MaterialDesignLite/pom.xml     |  28 +-
 .../src/main/resources/defaults.css                |   4 +-
 .../src/main/resources/mdl-manifest.xml            |   4 +-
 .../src/main/royale/MDLClasses.as                  |   2 +-
 .../main/royale/org/apache/royale/mdl/Dialog.as    |   2 +-
 .../main/royale/org/apache/royale/mdl/TextField.as |  18 +
 ... DynamicTabsAddItemRendererForArrayListData.as} |  69 +--
 .../beads/{Restrict.as => NonEmptyTextField.as}    | 108 ++--
 .../beads/{Restrict.as => RestrictTextField.as}    |  51 +-
 ...TabsDataItemRendererFactoryForArrayListData.as} |  60 +-
 .../org/apache/royale/mdl/beads/views/TabsView.as  |  26 +-
 frameworks/projects/Mobile/pom.xml                 |  16 +-
 frameworks/projects/Network/pom.xml                |  12 +-
 frameworks/projects/Reflection/pom.xml             |   8 +-
 frameworks/projects/Storage/pom.xml                |   8 +-
 frameworks/projects/TLF/pom.xml                    |   8 +-
 frameworks/projects/Text/pom.xml                   |   8 +-
 frameworks/projects/XML/pom.xml                    |  12 +-
 frameworks/projects/pom.xml                        |   4 +-
 ...nvert New Flex Project to Royale Project.launch |  10 +-
 mustella/build.xml                                 |   2 +
 pom.xml                                            |   8 +-
 releasecandidate.xml                               | 689 +++++++++++++++++----
 80 files changed, 1589 insertions(+), 643 deletions(-)

diff --cc frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 5c05f25,0a57697..3ce4773
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@@ -151,10 -153,12 +153,13 @@@
      <component id="DataItemRendererFactoryForArrayData" class="org.apache.royale.html.beads.DataItemRendererFactoryForArrayData"
/>
      <component id="DataItemRendererFactoryForArrayList" class="org.apache.royale.html.beads.DataItemRendererFactoryForArrayList"
/>
      <component id="DynamicItemsRendererFactoryForArrayListData" class="org.apache.royale.html.beads.DynamicItemsRendererFactoryForArrayListData"
/>
+     <component id="DynamicAddItemRendererForArrayListData" class="org.apache.royale.html.beads.DynamicAddItemRendererForArrayListData"/>
      <component id="DynamicRemoveItemRendererForArrayListData" class="org.apache.royale.html.beads.DynamicRemoveItemRendererForArrayListData"
/>
+     <component id="DynamicUpdateItemRendererForArrayListData" class="org.apache.royale.html.beads.DynamicUpdateItemRendererForArrayListData"/>
      <component id="DataItemRendererFactoryForHierarchicalData" class="org.apache.royale.html.beads.DataItemRendererFactoryForHierarchicalData"
/>
 +    <component id="DataItemRendererFactoryForCollectionView" class="org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView"
/>
      <component id="DynamicRemoveAllItemRendererForArrayListData" class="org.apache.royale.html.beads.DynamicRemoveAllItemRendererForArrayListData"
/>
+     <component id="DynamicRemoveAllByNullItemRendererForArrayListData" class="org.apache.royale.html.beads.DynamicRemoveAllByNullItemRendererForArrayListData"
/>
      <component id="TextItemRendererFactoryForArrayData" class="org.apache.royale.html.beads.TextItemRendererFactoryForArrayData"
/>
      <component id="TextItemRendererFactoryForStringVectorData" class="org.apache.royale.html.beads.TextItemRendererFactoryForStringVectorData"
/>
  
diff --cc frameworks/projects/Basic/src/main/royale/BasicClasses.as
index 9d043cb,6ba89fc..5777a46
--- a/frameworks/projects/Basic/src/main/royale/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
@@@ -168,10 -166,8 +168,9 @@@ internal class BasicClasse
      import org.apache.royale.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
  	import org.apache.royale.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData;
      import org.apache.royale.html.beads.DynamicItemsRendererFactoryForArrayListData; DynamicItemsRendererFactoryForArrayListData;
-     import org.apache.royale.html.beads.DynamicRemoveItemRendererForArrayListData; DynamicRemoveItemRendererForArrayListData;
  	import org.apache.royale.html.beads.DataItemRendererFactoryForArrayList; DataItemRendererFactoryForArrayList;
  	import org.apache.royale.html.beads.DataItemRendererFactoryForHierarchicalData; DataItemRendererFactoryForHierarchicalData;
 +	import org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView; DataItemRendererFactoryForCollectionView;
  	import org.apache.royale.html.supportClasses.DataGroup; DataGroup;
  	import org.apache.royale.html.supportClasses.Viewport; Viewport;
  	import org.apache.royale.html.supportClasses.ScrollingViewport; ScrollingViewport;

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.

Mime
View raw message