You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2019/12/13 06:18:27 UTC

[royale-asjs] branch develop updated (ccbd603 -> d509a3f)

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

gregdove pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.


    from ccbd603  go back to uninitialized rowHeight
     new b2133b6  Fix swf ConstantBinding - error was being thrown if the source is an extenal class, and not the mxml document. (DatabindingTestbed)
     new b1bc922  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
     new d509a3f  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/royale/org/apache/royale/binding/ConstantBinding.as  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


[royale-asjs] 01/03: Fix swf ConstantBinding - error was being thrown if the source is an extenal class, and not the mxml document. (DatabindingTestbed)

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b2133b685b9a8274a2230d4c7c627a98a6275c62
Author: greg-dove <gr...@gmail.com>
AuthorDate: Thu Dec 12 15:32:54 2019 +1300

    Fix swf ConstantBinding - error was being thrown if the source is an extenal class, and not the mxml document. (DatabindingTestbed)
---
 .../src/main/royale/org/apache/royale/binding/ConstantBinding.as  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ConstantBinding.as b/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ConstantBinding.as
index a730ee9..66893ee 100644
--- a/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ConstantBinding.as
+++ b/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ConstantBinding.as
@@ -171,7 +171,13 @@ package org.apache.royale.binding
             
             if (sourceID != null)
             {
-                source = document[sourceID];
+                COMPILE::SWF{
+                    if (sourceID in document)
+                        source = document[sourceID];
+                }
+                COMPILE::JS{
+                    source = document[sourceID];
+                }
             }
             else
             {


[royale-asjs] 03/03: Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d509a3f46610418059eab6cc7315bae3fee54204
Merge: b1bc922 ccbd603
Author: greg-dove <gr...@gmail.com>
AuthorDate: Fri Dec 13 19:17:57 2019 +1300

    Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

 examples/royale/DataGridExample/pom.xml            |   2 +
 .../src/main/royale/MyInitialView.mxml             |   5 +-
 .../src/main/resources/assets/smallbluerect.jpg    | Bin 0 -> 13500 bytes
 .../src/main/resources/assets/smallgreenrect.jpg   | Bin 0 -> 13542 bytes
 .../src/main/resources/assets/smallorangerect.gif  | Bin 0 -> 821 bytes
 .../src/main/resources/assets/smallorangerect.jpg  | Bin 0 -> 13571 bytes
 .../src/main/resources/assets/smallpurplerect.jpg  | Bin 0 -> 13517 bytes
 .../src/main/resources/assets/smallredrect.jpg     | Bin 0 -> 13477 bytes
 .../src/main/resources/assets/smallyellowrect.jpg  | Bin 0 -> 13598 bytes
 .../src/main/royale/ButtonBarPlayGround.mxml       | 111 ++++++++
 .../src/main/royale/DataGridPlayGround.mxml        | 103 +++++++
 .../TourDeJewel/src/main/royale/MainContent.mxml   |   2 +
 .../itemRenderers/ImageListItemRenderer.mxml       |  44 +++
 .../src/main/royale/models/ListsModel.as           |  27 ++
 .../src/main/royale/models/MainNavigationModel.as  |   4 +-
 .../src/main/royale/models/ProductModel.as         |  33 ++-
 .../TourDeJewel/src/main/royale/vos/Product.as     |  66 ++++-
 .../org/apache/royale/core/IDataGridModel.as       |   2 +-
 .../projects/Jewel/src/main/resources/defaults.css |  93 ++++++
 .../Jewel/src/main/resources/jewel-manifest.xml    |   8 +
 .../projects/Jewel/src/main/royale/JewelClasses.as |  12 +-
 .../royale/jewel/ApplicationResponsiveView.as      |   2 +-
 .../main/royale/org/apache/royale/jewel/Button.as  | 162 +++++------
 .../royale/org/apache/royale/jewel/ButtonBar.as    | 153 ++++++++++
 .../main/royale/org/apache/royale/jewel/Card.as    |   1 -
 .../royale/org/apache/royale/jewel/DataGrid.as     | 257 +++++++++++++++++
 .../royale/org/apache/royale/jewel/GridCell.as     |   5 +-
 .../ListSingleSelectionMouseController.as          |   1 +
 .../royale/jewel/beads/layouts/ButtonBarLayout.as  | 184 ++++++++++++
 .../royale/jewel/beads/layouts/DataGridLayout.as   | 153 ++++++++++
 .../royale/jewel/beads/layouts/HorizontalLayout.as |   4 +-
 .../jewel/beads/layouts/SimpleHorizontalLayout.as  |   2 +-
 .../jewel/beads/models/ArrayListSelectionModel.as  |   7 +-
 .../beads/models/DataGridPresentationModel.as      |  88 ++++++
 .../DataGroup.as => beads/views/ButtonBarView.as}  |  61 ++--
 .../royale/jewel/beads/views/DataGridView.as       | 297 +++++++++++++++++++
 .../apache/royale/jewel/beads/views/ListView.as    |   9 +-
 .../jewel/itemRenderers/ButtonBarItemRenderer.as   | 313 +++++++++++++++++++++
 .../apache/royale/jewel/supportClasses/Viewport.as |   5 +-
 .../jewel/supportClasses/button/SimpleButton.as    |   4 +-
 .../supportClasses/datagrid/DataGridButtonBar.as}  |  46 ++-
 .../supportClasses/datagrid/DataGridColumn.as      |  16 +-
 .../supportClasses/datagrid/DataGridColumnList.as} |  60 ++--
 .../supportClasses/datagrid/DataGridListArea.as}   |  27 +-
 .../jewel/supportClasses/datagrid/IDataGrid.as}    |  35 ++-
 .../datagrid/IDataGridColumnList.as}               |  33 ++-
 .../royale/jewel/supportClasses/list/DataGroup.as  |  16 +-
 .../Jewel/src/main/sass/components/_buttonbar.sass |  49 ++++
 .../Jewel/src/main/sass/components/_datagrid.sass  | 101 +++++++
 .../Jewel/src/main/sass/components/_layout.sass    |  15 +
 .../projects/Jewel/src/main/sass/defaults.sass     |   2 +
 .../MXRoyale/src/main/resources/defaults.css       |   9 +
 .../src/main/royale/mx/controls/DataGrid.as        |   1 +
 .../MXRoyale/src/main/royale/mx/controls/List.as   |   2 +-
 .../AdvancedDataGridItemRenderer.as                |   4 +-
 .../mx/controls/beads/AdvancedDataGridView.as      |   6 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../src/main/resources/defaults.css                |   8 +-
 .../JewelTheme/src/main/resources/defaults.css     |   8 +-
 .../sass/components-primary/_itemRenderer.sass     |   2 +-
 .../main/sass/components-primary/_navigation.sass  |   2 +-
 .../src/main/sass/components-primary/_tabbar.sass  |   2 +-
 .../src/main/sass/components-primary/_table.sass   |   2 +-
 85 files changed, 2481 insertions(+), 369 deletions(-)


[royale-asjs] 02/03: Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b1bc9226061ea436a38237cfa7b89948675423a4
Merge: b2133b6 bfcce64
Author: greg-dove <gr...@gmail.com>
AuthorDate: Fri Dec 13 08:08:51 2019 +1300

    Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

 examples/mxroyale/tourdeflexmodules/build.xml            |  7 +++++--
 .../projects/MXRoyale/src/main/resources/defaults.css    |  3 ++-
 .../src/main/royale/mx/controls/listClasses/ListBase.as  | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)