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 2020/01/14 17:44:49 UTC
[royale-asjs] branch develop updated: jewel-datagrid: partial fix
for RTE when removing an item (row). selection still must be adjusted
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 93c2d0f jewel-datagrid: partial fix for RTE when removing an item (row). selection still must be adjusted
93c2d0f is described below
commit 93c2d0f33d494b45ab2cbebee0bb09852b2896f9
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Jan 14 18:44:36 2020 +0100
jewel-datagrid: partial fix for RTE when removing an item (row). selection still must be adjusted
---
.../RemoveListItemRendererForArrayListData.as | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as
index d81c04b..e883c66 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as
@@ -29,6 +29,7 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.beads.IListView;
+ import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
/**
* Handles the removal of an itemRenderer in a List component once the corresponding
@@ -139,12 +140,19 @@ package org.apache.royale.jewel.beads.itemRenderers
ir = itemRendererParent.getItemRendererAt(i) as ISelectableItemRenderer;
ir.index = i;
}
- //adjust the model's selectedIndex, if applicable
- if (event.index < ISelectionModel(_dataProviderModel).selectedIndex) {
- ISelectionModel(_dataProviderModel).selectedIndex = ISelectionModel(_dataProviderModel).selectedIndex - 1;
- } else if (event.index == ISelectionModel(_dataProviderModel).selectedIndex) {
- ISelectionModel(_dataProviderModel).selectedIndex = -1;
- }
+
+ if(_dataProviderModel)
+ {
+ //adjust the model's selectedIndex, if applicable
+ if (event.index < ISelectionModel(_dataProviderModel).selectedIndex)
+ {
+ ISelectionModel(_dataProviderModel).selectedIndex = ISelectionModel(_dataProviderModel).selectedIndex - 1;
+ }
+ else if (event.index == ISelectionModel(_dataProviderModel).selectedIndex)
+ {
+ ISelectionModel(_dataProviderModel).selectedIndex = -1;
+ }
+ }
(_strand as IEventDispatcher).dispatchEvent(new Event("layoutNeeded"));
}