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 14:55:12 UTC
[royale-asjs] branch develop updated: fix a bug when getting the
right index for a selected table cell
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 5151011 fix a bug when getting the right index for a selected table cell
5151011 is described below
commit 51510112fc7f369a7e45ab22d4f8c37886a81cc9
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Aug 17 16:55:06 2018 +0200
fix a bug when getting the right index for a selected table cell
---
.../jewel/beads/controllers/TableCellSelectionMouseController.as | 2 +-
.../main/royale/org/apache/royale/jewel/beads/models/TableModel.as | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
index a20f5f0..18af8a8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
@@ -142,7 +142,7 @@ package org.apache.royale.jewel.beads.controllers
model.labelField = renderer.labelField;
model.selectedItem = event.data;
(model as TableModel).selectedItemProperty = model.selectedItem[model.labelField];
- model.selectedIndex = (model as TableModel).getIndexForSelectedProperty();
+ model.selectedIndex = (model as TableModel).getIndexForSelectedItemProperty();
view.host.dispatchEvent(new Event("change"));
}
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 e9a7327..81c3957 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
@@ -78,7 +78,7 @@ package org.apache.royale.jewel.beads.models
/**
* @private
*/
- public function getIndexForSelectedProperty():Number
+ public function getIndexForSelectedItemProperty():Number
{
if (!selectedItemProperty) return -1;
@@ -86,9 +86,9 @@ 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 = dataProvider.getItemAt(i)[column.dataField] as Object;
+ var test:Object = selectedItem[column.dataField] as Object;
- if (test === selectedItemProperty)
+ if (dataProvider.getItemAt(i) == selectedItem && labelField == column.dataField)
{
return index;
}