[royale-asjs] branch develop updated: jewel-datagrid: remove dependencies to DataGrid from DataGridSort

[ca...@apache.org]

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 22c20b1  jewel-datagrid: remove dependencies to DataGrid from DataGridSort
     new 17d06a4  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
22c20b1 is described below

commit 22c20b15587501e793b2705e0f10afa206b24bd0
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Oct 25 19:53:02 2020 +0100

    jewel-datagrid: remove dependencies to DataGrid from DataGridSort
---
 .../royale/jewel/beads/controls/datagrid/DataGridSort.as    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as
index b871439..64b2801 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as
@@ -22,13 +22,14 @@ package org.apache.royale.jewel.beads.controls.datagrid
 	import org.apache.royale.collections.Sort;
 	import org.apache.royale.collections.SortField;
 	import org.apache.royale.core.IBead;
+	import org.apache.royale.core.IDataGrid;
+	import org.apache.royale.core.IDataGridHeader;
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.MouseEvent;
-	import org.apache.royale.jewel.DataGrid;
 	import org.apache.royale.jewel.beads.views.DataGridView;
 	import org.apache.royale.jewel.supportClasses.datagrid.DataGridColumn;
-	import org.apache.royale.core.IDataGridHeader;
+	import org.apache.royale.core.UIBase;
 
 	/**
 	 *  The DataGridSort bead class is a specialty bead that can be use with a Jewel DataGrid control
@@ -48,7 +49,7 @@ package org.apache.royale.jewel.beads.controls.datagrid
 			super();
 		}
 		
-        private var dg:DataGrid;
+        private var dg:IDataGrid;
         private var header:IDataGridHeader;
 
 		private var descending:Boolean;
@@ -63,8 +64,8 @@ package org.apache.royale.jewel.beads.controls.datagrid
 		 */
 		public function set strand(value:IStrand):void
 		{
-            dg = value as DataGrid;
-			var dgView:DataGridView = dg.view as DataGridView;
+            dg = value as IDataGrid;
+			var dgView:DataGridView = (dg as UIBase).view as DataGridView;
 			header = dgView.header;
 			header.addEventListener(MouseEvent.CLICK, mouseClickHandler, false);
 		}
@@ -83,7 +84,7 @@ package org.apache.royale.jewel.beads.controls.datagrid
             // so the ButtonBar won't change selection
             if (event.target == header) return;
 			var column:DataGridColumn = event.target.data as DataGridColumn;
-			var collection:IArrayListView = dg.dataProvider as IArrayListView;
+			var collection:IArrayListView = dg.model.dataProvider as IArrayListView;
 			if (collection && collection.length)
 			{
 				if (collection.sort && collection.sort.fields[0].name == column.dataField)