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/17 18:11:50 UTC
[royale-asjs] branch develop updated: simply code in
tbodycontentarea additemrenderer methods and fix another bug in table model
selectedItemProperty
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 5784cf9 simply code in tbodycontentarea additemrenderer methods and fix another bug in table model selectedItemProperty
5784cf9 is described below
commit 5784cf9ad4f32e176fd6e687bcc1895c71fd08b7
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Aug 17 20:11:45 2018 +0200
simply code in tbodycontentarea additemrenderer methods and fix another bug in table model selectedItemProperty
---
.../apache/royale/jewel/beads/models/TableModel.as | 4 +--
.../apache/royale/jewel/beads/views/AlertView.as | 1 -
.../jewel/supportClasses/table/TBodyContentArea.as | 36 ++++++----------------
3 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as
index 81c3957..5015884 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as
@@ -66,7 +66,7 @@ package org.apache.royale.jewel.beads.models
var n:int = dataProvider.length;
for (var i:int = 0; i < n; i++)
{
- if (dataProvider.getItemAt(i)[labelField] == value)
+ if (dataProvider.getItemAt(i) == selectedItem && dataProvider.getItemAt(i)[labelField] == value)
{
selectedIndex = i;
break;
@@ -86,7 +86,7 @@ package org.apache.royale.jewel.beads.models
for(var i:int=0; i < dataProvider.length; i++) {
for(var j:int=0; j < _columns.length; j++) {
var column:TableColumn = _columns[j] as TableColumn;
- var test:Object = selectedItem[column.dataField] as Object;
+ var test:Object = dataProvider.getItemAt(i)[column.dataField] as Object;
if (dataProvider.getItemAt(i) == selectedItem && labelField == column.dataField)
{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index 0836de1..2014f02 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -197,7 +197,6 @@ package org.apache.royale.jewel.beads.views
// var controlBarLayout:HorizontalLayout = new HorizontalLayout();
// controlBar.addBead(controlBarLayout);
- // trace(controlBarLayout.hostComponent);
// controlBarLayout.itemsHorizontalAlign = "itemsSpaceBetween";
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
index f14c067..9463d2f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
@@ -95,22 +95,14 @@ package org.apache.royale.jewel.supportClasses.table
tableCell.addElement(r);
var row:TableRow;
- try
+ if(r.rowIndex > numElements -1)
{
- row = getElementAt(r.rowIndex) as TableRow;
-
- //this if only happens if numElemens == 0, so throw an Error to make a new TableRow in the catch section
- if(row == null)
- {
- row = new TableRow();
- addElementAt(row, r.rowIndex, false);
- }
- }
- catch (error:Error)
- {
- // this is the only way I found to do this when checking getElementAt() for an index that doen't exists.
row = new TableRow();
addElementAt(row, r.rowIndex, false);
+ }
+ else
+ {
+ row = getElementAt(r.rowIndex) as TableRow;
}
row.addElement(tableCell, dispatchAdded);
@@ -135,22 +127,14 @@ package org.apache.royale.jewel.supportClasses.table
tableCell.addElement(r);
var row:TableRow;
- try
+ if(r.rowIndex > numElements -1)
{
- row = getElementAt(r.rowIndex) as TableRow;
-
- //this if only happens if numElemens == 0, so throw an Error to make a new TableRow in the catch section
- if(row == null)
- {
- row = new TableRow();
- addElementAt(row, r.rowIndex, false);
- }
- }
- catch (error:Error)
- {
- // this is the only way I found to do this when checking getElementAt() for an index that doen't exists.
row = new TableRow();
addElementAt(row, r.rowIndex, false);
+ }
+ else
+ {
+ row = getElementAt(r.rowIndex) as TableRow;
}
row.addElementAt(tableCell, r.columnIndex, true);