You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by mi...@apache.org on 2014/10/23 18:23:59 UTC

[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34543 Accepting patch from Marcus Wilkinson.

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 <mi...@apache.org>
Authored: Thu Oct 23 17:16:31 2014 +0100
Committer: Mihai Chira <mi...@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;


[2/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34543 Added a unit test which reproduces the bug and thus prevents it from recurring.

Posted by mi...@apache.org.
FLEX-34543 Added a unit test which reproduces the bug and thus prevents it from recurring.


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

Branch: refs/heads/develop
Commit: 332ec4305cc649724b7d48bcd438ab579780500f
Parents: f47b67f
Author: Mihai Chira <mi...@apache.org>
Authored: Thu Oct 23 17:20:13 2014 +0100
Committer: Mihai Chira <mi...@apache.org>
Committed: Thu Oct 23 17:21:27 2014 +0100

----------------------------------------------------------------------
 .../DataGridEditor_FLEX_34543_Test.as           | 85 ++++++++++++++++++++
 1 file changed, 85 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332ec430/frameworks/tests/unitTests/spark/components/gridClasses/DataGridEditor_FLEX_34543_Test.as
----------------------------------------------------------------------
diff --git a/frameworks/tests/unitTests/spark/components/gridClasses/DataGridEditor_FLEX_34543_Test.as b/frameworks/tests/unitTests/spark/components/gridClasses/DataGridEditor_FLEX_34543_Test.as
new file mode 100644
index 0000000..6572d40
--- /dev/null
+++ b/frameworks/tests/unitTests/spark/components/gridClasses/DataGridEditor_FLEX_34543_Test.as
@@ -0,0 +1,85 @@
+package spark.components.gridClasses {
+    import mx.collections.ArrayCollection;
+    import mx.collections.ArrayList;
+    import mx.core.ClassFactory;
+    import mx.core.mx_internal;
+    import mx.managers.FocusManager;
+
+    import org.flexunit.asserts.assertEquals;
+    import org.flexunit.asserts.assertNotNull;
+    import org.fluint.uiImpersonation.UIImpersonator;
+
+    import spark.components.DataGrid;
+    import spark.events.GridItemEditorEvent;
+
+    public class DataGridEditor_FLEX_34543_Test
+    {
+        private var _dp:ArrayCollection;
+        private var _dg:DataGrid;
+        private var _sut:DataGridEditor;
+        private var _saveEvent:GridItemEditorEvent;
+
+        [Before]
+        public function setUp():void
+        {
+            _dp = new ArrayCollection([new FLEX_34543_DataNode("First"), new FLEX_34543_DataNode("Second")]);
+
+            _dg = new DataGrid();
+            _dg.editable = true;
+            _dg.dataProvider = _dp;
+
+            var nameColumn:GridColumn = new GridColumn();
+            nameColumn.dataField = "name";
+            nameColumn.itemEditor = new ClassFactory(DefaultGridItemEditor);
+            nameColumn.editable = true;
+            _dg.columns = new ArrayList([nameColumn]);
+
+            UIImpersonator.addChild(_dg);
+            _dg.focusManager = new FocusManager(_dg, false);
+
+            _sut = _dg.mx_internal::editor;
+        }
+
+        [After]
+        public function tearDown():void
+        {
+            _dg.removeEventListener(GridItemEditorEvent.GRID_ITEM_EDITOR_SESSION_SAVE, onGridEditorSave);
+            UIImpersonator.removeAllChildren();
+            _dg = null;
+            _dp = null;
+            _saveEvent = null;
+            _sut = null;
+        }
+
+        [Test]
+        public function testEndItemEditorSessionEventContainsCorrectIndex():void
+        {
+            //given
+            _dg.addEventListener(GridItemEditorEvent.GRID_ITEM_EDITOR_SESSION_SAVE, onGridEditorSave);
+            _dg.startItemEditorSession(1,0);
+
+            //when
+            _dp.removeItemAt(0);
+            _dg.endItemEditorSession();
+
+            //then
+            assertNotNull(_saveEvent);
+            assertEquals(0, _saveEvent.rowIndex);
+        }
+
+        private function onGridEditorSave(event:GridItemEditorEvent):void
+        {
+            _saveEvent = event;
+        }
+    }
+}
+
+class FLEX_34543_DataNode
+{
+    public var name:String;
+
+    public function FLEX_34543_DataNode(name:String)
+    {
+        this.name = name;
+    }
+}
\ No newline at end of file