Updated Branches: refs/heads/develop f185862fb -> a9cd1ea95
FIXED FLEX-33899 DataGrid goes blank when removing last item from dataProvider when requestedRowCount is set FIXED mispelled variable that caused getter to be used instead. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a9cd1ea9 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a9cd1ea9 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a9cd1ea9 Branch: refs/heads/develop Commit: a9cd1ea959174ca06c9d3ec6820009d0f7019c68 Parents: f185862 Author: mamsellem <[email protected]> Authored: Thu Nov 14 21:36:29 2013 +0100 Committer: mamsellem <[email protected]> Committed: Thu Nov 14 21:36:29 2013 +0100 ---------------------------------------------------------------------- frameworks/projects/spark/src/spark/components/Grid.as | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a9cd1ea9/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 7928f33..4a0be60 100644 --- a/frameworks/projects/spark/src/spark/components/Grid.as +++ b/frameworks/projects/spark/src/spark/components/Grid.as @@ -853,7 +853,7 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc const gridMaxVSP:Number = contentHeight - height; const centerContentHeight:Number = Math.ceil(gridViewLayout.gridDimensionsView.getContentHeight()); const centerMaxVSP:Number = centerContentHeight - centerGridView.height; - const vsp:Number = (centerMaxVSP / gridMaxVSP) * value; + const vsp:Number = gridMaxVSP == 0 ? 0 : (centerMaxVSP / gridMaxVSP) * value; centerGridView.verticalScrollPosition = vsp; @@ -4609,7 +4609,6 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc if (!variableRowHeight) setFixedRowHeight(gridDimensions.getRowHeight(0)); - } //-------------------------------------------------------------------------- @@ -5606,7 +5605,7 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc gridDimensions.columnCount = generatedColumns ? columns.length : 0; } - const gridDimenions:GridDimensions = this.gridDimensions; + const gridDimensions:GridDimensions = this.gridDimensions; if (gridDimensions) { gridDimensions.dataProviderCollectionChanged(event);
