You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/12/30 00:35:55 UTC
[royale-asjs] 12/13: get mxtests to pass
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 8f255dd18a1ee21f980b2d11e97057d047897baa
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Dec 28 10:18:36 2019 -0800
get mxtests to pass
---
.../MXRoyale/src/main/resources/defaults.css | 2 +-
.../AdvancedDataGridColumn.as | 9 ---------
.../mx/controls/beads/AdvancedDataGridView.as | 15 ++++++++++++++
.../main/royale/mx/controls/beads/DataGridView.as | 23 +++++++++++-----------
.../mx/controls/dataGridClasses/DataGridColumn.as | 11 +++++++++++
5 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index 3c00199..302a38a 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -187,7 +187,7 @@ DataGrid
{
IChangePropagator: ClassReference("org.apache.royale.html.beads.DataGridColumnChangePropagator");
IDataGridPresentationModel: ClassReference("org.apache.royale.html.beads.models.DataGridPresentationModel");
- IBeadView: ClassReference("org.apache.royale.html.beads.DataGridView");
+ IBeadView: ClassReference("mx.controls.beads.DataGridView");
IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridModel");
IBeadLayout: ClassReference("mx.controls.beads.layouts.DataGridLayout");
columnClass: ClassReference("mx.controls.dataGridClasses.DataGridColumnList");
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
index 1a40e5c..0cfeb0a 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
@@ -311,15 +311,6 @@ public class AdvancedDataGridColumn extends DataGridColumn
*/
// private var hasFontContextBeenSaved:Boolean = false;
- /**
- * @private
- * The zero-based index of this column as it is displayed in the grid.
- * It is not related to the structure of the data being displayed.
- * In MXML, the default order of the columns is the order of the
- * <code>mx:AdvancedDataGridColumn</code> tags.
- */
- mx_internal var colNum:Number;
-
// preferred width is the number we should use when measuring
// regular width will be changed if we shrink columns to fit.
// mx_internal var preferredWidth:Number = 100;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as
index 3d79972..5074bcb 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as
@@ -58,6 +58,7 @@ package mx.controls.beads
*/
public function AdvancedDataGridView()
{
+ columnClass = AdvancedDataGridColumn;
}
override protected function handleInitComplete(event:Event):void
@@ -73,6 +74,20 @@ package mx.controls.beads
IEventDispatcher(host).addEventListener("columnsInvalid", handleColumnsInvalid);
handleColumnsInvalid(null);
}
+
+ override protected function handleCollectionChanged(event:Event):void
+ {
+ if (columnLists == null) return;
+
+ for (var i:int=0; i < columnLists.length; i++)
+ {
+ var list:AdvancedDataGridColumnList = columnLists[i] as AdvancedDataGridColumnList;
+ list.adg = _strand as AdvancedDataGrid;
+ list.model.dispatchEvent(new Event("dataProviderChanged"));
+ }
+ host.dispatchEvent(new Event("layoutNeeded"));
+
+ }
private function handleColumnsInvalid(event:Event):void
{
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridView.as
index 5a20ad1..ca2bb57 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridView.as
@@ -21,9 +21,9 @@ package mx.controls.beads
import mx.collections.CursorBookmark;
import mx.collections.ICollectionView;
import mx.collections.IViewCursor;
- import mx.controls.AdvancedDataGrid;
- import mx.controls.advancedDataGridClasses.AdvancedDataGridColumn;
- import mx.controls.advancedDataGridClasses.AdvancedDataGridColumnList;
+ import mx.controls.dataGridClasses.DataGridColumn;
+ import mx.controls.dataGridClasses.DataGridColumnList;
+ import mx.core.UIComponent;
import mx.core.mx_internal;
import mx.events.CollectionEvent;
import mx.utils.ObjectUtil;
@@ -61,6 +61,8 @@ package mx.controls.beads
{
}
+ protected var columnClass:Class = DataGridColumn;
+
public var visibleColumns:Array = [];
override protected function handleInitComplete(event:Event):void
@@ -86,14 +88,13 @@ package mx.controls.beads
}
}
- private function handleCollectionChanged(event:Event):void
+ protected function handleCollectionChanged(event:Event):void
{
if (columnLists == null) return;
for (var i:int=0; i < columnLists.length; i++)
{
- var list:AdvancedDataGridColumnList = columnLists[i] as AdvancedDataGridColumnList;
- list.adg = _strand as AdvancedDataGrid;
+ var list:DataGridColumnList = columnLists[i] as DataGridColumnList;
list.model.dispatchEvent(new Event("dataProviderChanged"));
}
host.dispatchEvent(new Event("layoutNeeded"));
@@ -128,7 +129,7 @@ package mx.controls.beads
var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
if (sharedModel.dataProvider.length > 0)
{
- var col:AdvancedDataGridColumn;
+ var col:DataGridColumn;
var newCols:Array = [];
var cols:Array;
if (sharedModel.dataProvider)
@@ -165,10 +166,10 @@ package mx.controls.beads
{
if (p != "uid")
{
- col = new AdvancedDataGridColumn();
+ col = new columnClass() as DataGridColumn;
col.dataField = p;
newCols.push(col);
- col.owner = _strand as AdvancedDataGrid;
+ col.owner = _strand as UIComponent;
col.colNum = index++;
}
}
@@ -183,9 +184,9 @@ package mx.controls.beads
colName = cols[i];
if (colName is QName)
colName = QName(colName).localName;
- col = new AdvancedDataGridColumn();
+ col = new columnClass() as DataGridColumn;
col.dataField = String(colName);
- col.owner = _strand as AdvancedDataGrid;
+ col.owner = _strand as UIComponent;
col.colNum = i;
newCols.push(col);
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
index ce5bf77..fd6f4a5 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
@@ -402,6 +402,17 @@ public class DataGridColumn extends org.apache.royale.html.supportClasses.DataGr
public var sortDescending:Boolean = false;
mx_internal var owner:UIComponent;
+
+ /**
+ * @private
+ * The zero-based index of this column as it is displayed in the grid.
+ * It is not related to the structure of the data being displayed.
+ * In MXML, the default order of the columns is the order of the
+ * <code>mx:DataGridColumn</code> tags.
+ */
+ mx_internal var colNum:Number;
+
+
}
}