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 2555671 fix a regression in Table labelField and move
presentationModel to table initializer, also organize and clean a bit more
mapper
2555671 is described below
commit 2555671f85c3c2a47fb82822b0db4a8cdc415c8f
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Jul 25 01:44:27 2020 +0200
fix a regression in Table labelField and move presentationModel to table
initializer, also organize and clean a bit more mapper
---
.../itemRenderers/ListItemRendererInitializer.as | 3 ++-
.../TableItemRendererFactoryForCollectionView.as | 26 +++++-------------
.../itemRenderers/TableItemRendererInitializer.as | 31 +++++-----------------
3 files changed, 16 insertions(+), 44 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as
index aa41c0b..ab1caae 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as
@@ -67,7 +67,8 @@ package org.apache.royale.jewel.beads.itemRenderers
{
super.strand = value;
ownerView = (value as IStrandWithModelView).view as
IItemRendererOwnerView;
- presentationModel = (_strand as
IStrandWithPresentationModel).presentationModel as IListPresentationModel;
+ if(_strand as IStrandWithPresentationModel)
+ presentationModel = (_strand as
IStrandWithPresentationModel).presentationModel as IListPresentationModel;
}
override protected function
setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
index b68b0f6..20d6c9b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
@@ -24,17 +24,14 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.core.IItemRendererOwnerView;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrandWithModelView;
- import org.apache.royale.core.UIBase;
import org.apache.royale.events.Event;
import org.apache.royale.html.beads.DataItemRendererFactoryBase;
- import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.jewel.Label;
import org.apache.royale.jewel.Table;
import org.apache.royale.jewel.beads.controls.TextAlign;
import org.apache.royale.jewel.beads.models.TableModel;
import org.apache.royale.jewel.beads.views.TableView;
import org.apache.royale.jewel.itemRenderers.TableItemRenderer;
- import org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
import org.apache.royale.jewel.supportClasses.table.THead;
import org.apache.royale.jewel.supportClasses.table.TableColumn;
import org.apache.royale.jewel.supportClasses.table.TableHeaderCell;
@@ -100,8 +97,6 @@ package org.apache.royale.jewel.beads.itemRenderers
createHeader();
// -- 2) CREATION PHASE
- var presentationModel:IListPresentationModel =
_strand.getBeadByType(IListPresentationModel) as IListPresentationModel;
-
var column:TableColumn;
var ir:TableItemRenderer;
@@ -121,29 +116,22 @@ package org.apache.royale.jewel.beads.itemRenderers
ir = itemRendererFactory.createItemRenderer() as
TableItemRenderer;
}
+ ir.dataField = column.dataField;
+ ir.rowIndex = i;
+ ir.columnIndex = j;
+ if(column.align != "")
+ ir.align = column.align;
+
var data:Object =
model.dataProvider.getItemAt(i);
-
- (ir as StyledDataItemRenderer).dataField =
column.dataField;
- (ir as StyledDataItemRenderer).rowIndex
= i;
- (ir as
StyledDataItemRenderer).columnIndex = j;
(itemRendererInitializer as
IIndexedItemRendererInitializer).initializeIndexedItemRenderer(ir, data, index);
dataGroup.addItemRendererAt(ir, index);
- ir.labelField = column.dataField;
-
- if (presentationModel) {
- UIBase(ir).height =
presentationModel.rowHeight;
- }
+ ir.labelField = column.dataField;
ir.index = index;
ir.data = data;
- if(column.align != "")
- {
- ir.align = column.align;
- }
-
index++;
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
index 6a61f62..b2270a7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
@@ -19,9 +19,7 @@
package org.apache.royale.jewel.beads.itemRenderers
{
import org.apache.royale.core.IIndexedItemRenderer;
- import org.apache.royale.core.IItemRendererOwnerView;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IStrandWithModelView;
+ import org.apache.royale.core.StyledUIBase;
import org.apache.royale.jewel.itemRenderers.TableItemRenderer;
/**
@@ -36,7 +34,7 @@ package org.apache.royale.jewel.beads.itemRenderers
* @playerversion AIR 2.6
* @productversion Royale 0.10.0
*/
- public class TableItemRendererInitializer extends
IndexedItemRendererInitializer
+ public class TableItemRendererInitializer extends
ListItemRendererInitializer
{
/**
* constructor.
@@ -49,24 +47,6 @@ package org.apache.royale.jewel.beads.itemRenderers
public function TableItemRendererInitializer()
{
}
-
- protected var ownerView:IItemRendererOwnerView;
-
- /**
- * @copy org.apache.royale.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- * @royaleignorecoercion HTMLInputElement
- * @royaleignorecoercion org.apache.royale.core.UIBase;
- */
- override public function set strand(value:IStrand):void
- {
- super.strand = value;
- ownerView = (value as IStrandWithModelView).view as
IItemRendererOwnerView;
- }
/**
* @copy org.apache.royale.core.IBead#strand
@@ -78,14 +58,17 @@ package org.apache.royale.jewel.beads.itemRenderers
*/
override protected function
setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
{
+ super.setupVisualsForItemRenderer(ir);
+
var tir:TableItemRenderer = ir as TableItemRenderer;
if (tir && ownerView)
tir.itemRendererOwnerView = ownerView;
- setPaddings(tir);
+ if (presentationModel) {
+ StyledUIBase(ir).height =
presentationModel.rowHeight;
+ }
}
-
// public static const DEFAULT_PADDING:Number = 8;
}
}
