You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2022/02/11 08:34:09 UTC

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

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

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

commit 145f6e0733ba7b4fa9895ab0ec1b0a89cf7da88b
Merge: 5e48fef 4f4d55d
Author: greg-dove <gr...@gmail.com>
AuthorDate: Fri Feb 11 16:28:12 2022 +1300

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

 .../main/royale/org/apache/royale/utils/async/CompoundAsyncTask.as    | 4 +++-
 .../main/royale/org/apache/royale/utils/async/SequentialAsyncTask.as  | 4 +++-
 .../projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --cc frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
index 0358200,0358200..9aa9ff2
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
@@@ -1314,6 -1314,6 +1314,8 @@@ public class AdvancedDataGrid extends A
          if (value is IHierarchicalData)
          {
              _rootModel = value as IHierarchicalData;
++            // view is passed on to column lists and we want to make sure those realize it's a new instance
++            _hierarchicalCollectionView = new HierarchicalCollectionView();
          }
          else if (value is IHierarchicalCollectionView)
          {