This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 6981eb44d5946e59e644e36b68a028ec19b19b7c Author: Alex Harui <[email protected]> AuthorDate: Sun Dec 2 22:19:02 2018 -0800 allow subclasses to access dataProviderModel before the strand is set --- .../royale/html/beads/DataItemRendererFactoryForCollectionView.as | 2 +- .../apache/royale/html/beads/DynamicAddItemRendererForArrayListData.as | 2 +- .../html/beads/DynamicRemoveAllByNullItemRendererForArrayListData.as | 2 +- .../royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as | 2 +- .../royale/html/beads/DynamicRemoveItemRendererForArrayListData.as | 2 +- .../royale/html/beads/DynamicUpdateItemRendererForArrayListData.as | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as index ca360d6..6661524 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as @@ -104,7 +104,7 @@ package org.apache.royale.html.beads */ public function get dataProviderModel():IDataProviderModel { - if (_dataProviderModel == null) { + if (_dataProviderModel == null && _strand != null) { _dataProviderModel = _strand.getBeadByType(IBeadModel) as IDataProviderModel; } return _dataProviderModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicAddItemRendererForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicAddItemRendererForArrayListData.as index da86642..9528185 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicAddItemRendererForArrayListData.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicAddItemRendererForArrayListData.as @@ -151,7 +151,7 @@ package org.apache.royale.html.beads */ public function get dataProviderModel(): IDataProviderModel { - if (_dataProviderModel == null) { + if (_dataProviderModel == null && _strand != null) { _dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; } return _dataProviderModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllByNullItemRendererForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllByNullItemRendererForArrayListData.as index ab64441..b264da2 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllByNullItemRendererForArrayListData.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllByNullItemRendererForArrayListData.as @@ -120,7 +120,7 @@ package org.apache.royale.html.beads */ public function get dataProviderModel(): IDataProviderModel { - if (_dataProviderModel == null) { + if (_dataProviderModel == null && _strand != null) { _dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; } return _dataProviderModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as index c78805c..655726b 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as @@ -134,7 +134,7 @@ package org.apache.royale.html.beads */ public function get dataProviderModel(): IDataProviderModel { - if (_dataProviderModel == null) { + if (_dataProviderModel == null && _strand != null) { _dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; } return _dataProviderModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveItemRendererForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveItemRendererForArrayListData.as index d0bee21..3ef3f8e 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveItemRendererForArrayListData.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveItemRendererForArrayListData.as @@ -140,7 +140,7 @@ package org.apache.royale.html.beads */ public function get dataProviderModel(): IDataProviderModel { - if (_dataProviderModel == null) { + if (_dataProviderModel == null && _strand != null) { _dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; } return _dataProviderModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicUpdateItemRendererForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicUpdateItemRendererForArrayListData.as index 7661058..5823fda 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicUpdateItemRendererForArrayListData.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicUpdateItemRendererForArrayListData.as @@ -135,7 +135,7 @@ package org.apache.royale.html.beads */ public function get dataProviderModel(): IDataProviderModel { - if (_dataProviderModel == null) { + if (_dataProviderModel == null && _strand != null) { _dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; } return _dataProviderModel;
