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 2018/08/28 22:37:03 UTC

[royale-asjs] branch develop updated: fix remove a row in table component

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 096c50a  fix remove a row in table component
096c50a is described below

commit 096c50af2fba68f0c005b76b8a4b3023db01a57f
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Aug 29 00:36:58 2018 +0200

    fix remove a row in table component
---
 .../AddTableItemRendererForArrayListData.as        |  9 +++------
 .../RemoveTableItemRendererForArrayListData.as     | 23 ++++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as
index 1150310..c826e5c 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as
@@ -19,7 +19,6 @@
 package org.apache.royale.jewel.beads.itemRenderers
 {
 	import org.apache.royale.core.IBead;
-	import org.apache.royale.core.IDataProviderModel;
 	import org.apache.royale.core.IItemRendererClassFactory;
 	import org.apache.royale.core.IItemRendererParent;
 	import org.apache.royale.core.IList;
@@ -32,13 +31,11 @@ package org.apache.royale.jewel.beads.itemRenderers
 	import org.apache.royale.events.CollectionEvent;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.utils.loadBeadFromValuesManager;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
+	import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
 	import org.apache.royale.jewel.beads.models.TableModel;
 	import org.apache.royale.jewel.supportClasses.table.TableColumn;
-	import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
-	import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
-	import org.apache.royale.html.supportClasses.DataItemRenderer;
-	import org.apache.royale.collections.ICollectionView;
+	import org.apache.royale.utils.loadBeadFromValuesManager;
 
     /**
 	 *  Handles the adding of an itemRenderer in a Table component once the corresponding datum has been added
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as
index bdfcf44..06685ba 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as
@@ -19,17 +19,17 @@
 package org.apache.royale.jewel.beads.itemRenderers
 {
 	import org.apache.royale.core.IBead;
-	import org.apache.royale.core.IDataProviderModel;
 	import org.apache.royale.core.IItemRendererParent;
 	import org.apache.royale.core.IList;
 	import org.apache.royale.core.ISelectableItemRenderer;
 	import org.apache.royale.core.ISelectionModel;
 	import org.apache.royale.core.IStrand;
-	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.CollectionEvent;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.jewel.beads.models.TableModel;
+	import org.apache.royale.jewel.supportClasses.table.TableCell;
+	import org.apache.royale.jewel.supportClasses.table.TableRow;
 
 	/**
 	 *  Handles the removal of an itemRenderer in a Table component once the corresponding 
@@ -122,20 +122,23 @@ package org.apache.royale.jewel.beads.itemRenderers
 		 */
 		protected function handleItemRemoved(event:CollectionEvent):void
 		{
-			var parent:UIBase = itemRendererParent as UIBase;
 			var ir:ISelectableItemRenderer;
-			
-			// for(var j:int = 0; j < model.columns.length; j++)
-			// {
-				ir = parent.getElementAt(event.index) as ISelectableItemRenderer;
+			var cell:TableCell;
+			var processedRow:TableRow = itemRendererParent.getElementAt(event.index) as TableRow;
+			while (processedRow.numElements > 0) {
+				cell = processedRow.getElementAt(0) as TableCell;
+				ir = cell.getElementAt(0) as ISelectableItemRenderer;
 				itemRendererParent.removeItemRenderer(ir);
-			// }
+				cell.removeElement(ir);
+				processedRow.removeElement(cell);
+			}
+			itemRendererParent.removeElement(processedRow);
 
 			// adjust the itemRenderers' index to adjust for the shift
-			var n:int = parent.numElements;
+			var n:int = itemRendererParent.numElements;
 			for (var i:int = event.index; i < n; i++)
 			{
-				ir = parent.getElementAt(i) as ISelectableItemRenderer;
+				ir = itemRendererParent.getElementAt(i) as ISelectableItemRenderer;
 				ir.index = i;
 			}