You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/11 21:57:21 UTC

[royale-asjs] branch develop updated: basic-mapper: fix for the case of assign dataProvider = null, but renderes remain. We need to removeAllItemRenderers too

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new 893667d  basic-mapper: fix for the case of assign dataProvider = null, but renderes remain. We need to removeAllItemRenderers too
893667d is described below

commit 893667dde37f91d631b16f590d08e2f2ec6b940c
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Mar 11 22:57:13 2020 +0100

    basic-mapper: fix for the case of assign dataProvider = null, but renderes remain. We need to removeAllItemRenderers too
---
 .../apache/royale/html/beads/DataItemRendererFactoryBase.as    | 10 +++++-----
 .../html/beads/DataItemRendererFactoryForCollectionView.as     |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
index d38e0b3..b213992 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
@@ -66,16 +66,16 @@ package org.apache.royale.html.beads
 		 *  @royaleignorecoercion org.apache.royale.core.IIndexedItemRendererInitializer
 		 */		
 		override protected function dataProviderChangeHandler(event:Event):void
-		{
-			var dp:Object = dataProviderModel.dataProvider;
-			if (!dp)
-				return;
-						
+		{			
 			var view:IListView = (_strand as IStrandWithModelView).view as IListView;
 			var dataGroup:IItemRendererOwnerView = view.dataGroup;
 			
 			removeAllItemRenderers(dataGroup);
 			
+			var dp:Object = dataProviderModel.dataProvider;
+			if (!dp)
+				return;
+			
 			var n:int = dataProviderLength; 
 			for (var i:int = 0; i < n; i++)
 			{				
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 3e6596b..aa6e00e 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
@@ -53,6 +53,9 @@ package org.apache.royale.html.beads
 			if (!dataProviderModel)
 				return;
 			dp = dataProviderModel.dataProvider as ICollectionView;
+			
+			super.dataProviderChangeHandler(event);
+			
 			if (!dp)
 				return;
 			
@@ -61,8 +64,6 @@ package org.apache.royale.html.beads
 			dped.addEventListener(CollectionEvent.ITEM_ADDED, itemAddedHandler);
 			dped.addEventListener(CollectionEvent.ITEM_REMOVED, itemRemovedHandler);
 			dped.addEventListener(CollectionEvent.ITEM_UPDATED, itemUpdatedHandler);
-			
-			super.dataProviderChangeHandler(event);
 		}
 		
 		/**