flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mih...@apache.org
Subject [1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34543 Accepting patch from Marcus Wilkinson.
Date Thu, 23 Oct 2014 16:23:59 GMT
Repository: flex-sdk
Updated Branches:
  refs/heads/develop 2fc9a8d5b -> 332ec4305


FLEX-34543 Accepting patch from Marcus Wilkinson.


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f47b67f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f47b67f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f47b67f6

Branch: refs/heads/develop
Commit: f47b67f62419286eb2c116be11b229ae3ce1bdd6
Parents: 2fc9a8d
Author: Mihai Chira <mihaic@apache.org>
Authored: Thu Oct 23 17:16:31 2014 +0100
Committer: Mihai Chira <mihaic@apache.org>
Committed: Thu Oct 23 17:16:31 2014 +0100

----------------------------------------------------------------------
 .../spark/src/spark/components/gridClasses/DataGridEditor.as    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f47b67f6/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
index ef8863b..234c67a 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
@@ -931,7 +931,7 @@ public class DataGridEditor
         
         dataGridEvent.columnIndex = editedItemPosition.columnIndex;
         dataGridEvent.column = itemEditorInstance.column;
-        dataGridEvent.rowIndex = editedItemPosition.rowIndex;
+        dataGridEvent.rowIndex = dataGrid.dataProvider ? dataGrid.dataProvider.getItemIndex(itemEditorInstance.data)
: -1;
         dataGrid.dispatchEvent(dataGridEvent);
     }
     
@@ -960,6 +960,7 @@ public class DataGridEditor
         inEndEdit = true;
         
         var itemPosition:Object = editedItemPosition;
+        var editedItem:Object = itemEditorInstance.data;
         if (!saveItemEditorSession())
         {
             // The save was cancelled so check if the editor can be cancelled.
@@ -977,7 +978,7 @@ public class DataGridEditor
         // GRID_ITEM_EDITOR_SESSION_SAVE events are NOT cancelable
         dataGridEvent.columnIndex = itemPosition.columnIndex;
         dataGridEvent.column = dataGrid.columns.getItemAt(itemPosition.columnIndex) as GridColumn;
-        dataGridEvent.rowIndex = itemPosition.rowIndex;
+        dataGridEvent.rowIndex = dataGrid.dataProvider ? dataGrid.dataProvider.getItemIndex(editedItem)
: -1;
         dataGrid.dispatchEvent(dataGridEvent);
 
         inEndEdit = false;


Mime
View raw message