flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mamsel...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - UNDO FIX https://issues.apache.org/jira/browse/FLEX-33813 (DataGrid goes blank when scrolled and dataProvider is changed ) UNDO Fix https://issues.apache.org/jira/browse/FLEX-33818 (Spark Datagrid column resi
Date Mon, 14 Oct 2013 20:21:46 GMT
Updated Branches:
  refs/heads/develop e376a1e5d -> fca2a3812


UNDO FIX https://issues.apache.org/jira/browse/FLEX-33813 (DataGrid goes blank when scrolled
and dataProvider is changed )
UNDO Fix https://issues.apache.org/jira/browse/FLEX-33818 (Spark Datagrid column resize and
sort bug when releasing mouse outside of headers)


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

Branch: refs/heads/develop
Commit: fca2a38124a2f93bdf8868b008b845553919279c
Parents: e376a1e
Author: mamsellem <maurice.amsellem@systar.com>
Authored: Mon Oct 14 22:21:17 2013 +0200
Committer: mamsellem <maurice.amsellem@systar.com>
Committed: Mon Oct 14 22:21:17 2013 +0200

----------------------------------------------------------------------
 .../projects/spark/src/spark/components/Grid.as | 23 +++-----------------
 .../spark/components/GridColumnHeaderGroup.as   |  4 +---
 2 files changed, 4 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fca2a381/frameworks/projects/spark/src/spark/components/Grid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Grid.as b/frameworks/projects/spark/src/spark/components/Grid.as
index 847fa1d..9dcfbd3 100644
--- a/frameworks/projects/spark/src/spark/components/Grid.as
+++ b/frameworks/projects/spark/src/spark/components/Grid.as
@@ -269,9 +269,7 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
      *  rowIndex of the caret after a collection refresh event.
      */    
     private var caretSelectedItem:Object = null;
-    private var updateCaretForDataProviderChanged:Boolean = false;
-    private var updateCaretForDataProviderChangeLastEvent:CollectionEvent;
-    
+
     /**
      *  @private
      *  True while updateDisplayList is running.  Use to disable invalidateSize(),
@@ -4602,13 +4600,8 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
 		
 		if (!variableRowHeight)
 			setFixedRowHeight(gridDimensions.getRowHeight(0));
-        if (updateCaretForDataProviderChanged){
-            updateCaretForDataProviderChanged = false;
-            updateCaretForDataProviderChange(updateCaretForDataProviderChangeLastEvent);
-            updateCaretForDataProviderChangeLastEvent = null;
         }
-	}
-        
+
     //--------------------------------------------------------------------------
     //
     //  Methods
@@ -5626,19 +5619,9 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
         invalidateSize();
         invalidateDisplayList();
         
-        if (caretRowIndex != -1)  {
-            if (event.kind == CollectionEventKind.RESET){
-                // defer for reset events 
-                updateCaretForDataProviderChanged = true;
-                updateCaretForDataProviderChangeLastEvent = event;
-                invalidateDisplayList(); 
-            }
-            else {
+        if (caretRowIndex != -1)
                 updateCaretForDataProviderChange(event);
-            }         
-        }
 
-        
         // Trigger bindings to selectedIndex/selectedCell/selectedItem and the plurals of
those.
         if (selectionChanged)
             dispatchFlexEvent(FlexEvent.VALUE_COMMIT);

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fca2a381/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
index bd62162..51827f9 100644
--- a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
+++ b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
@@ -1064,11 +1064,9 @@ public class GridColumnHeaderGroup extends Group implements IDataGridElement
     {
         const eventHeaderCP:CellPosition = new CellPosition();
         const eventHeaderXY:Point = new Point();
-         // mouse can be released outside of header , so don't check    cf.    https://issues.apache.org/jira/browse/FLEX-33818
-          if (event.type != MouseEvent.MOUSE_UP &&  !eventToHeaderLocations(event,
eventHeaderCP, eventHeaderXY))
+        if (!eventToHeaderLocations(event, eventHeaderCP, eventHeaderXY))
                 return;
 
-
         const eventSeparatorIndex:int = eventHeaderCP.rowIndex;
         const eventColumnIndex:int = (eventSeparatorIndex == -1) ? eventHeaderCP.columnIndex
: -1;
         


Mime
View raw message