You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jb...@apache.org on 2012/12/19 15:03:39 UTC
svn commit: r1423864 - in
/incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls:
AdvancedDataGrid.as AdvancedDataGridBaseEx.as OLAPDataGrid.as
listClasses/AdvancedListBase.as
Author: jbalsas
Date: Wed Dec 19 14:03:37 2012
New Revision: 1423864
URL: http://svn.apache.org/viewvc?rev=1423864&view=rev
Log:
Fix for advancedgrids falcon compilation issue FLEX-33301
Modified:
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/OLAPDataGrid.as
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as
Modified: incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as?rev=1423864&r1=1423863&r2=1423864&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as Wed Dec 19 14:03:37 2012
@@ -4730,8 +4730,7 @@ public class AdvancedDataGrid extends Ad
if (cellUID in cellSelectionIndicators)
{
- var cellIndicator:Object = cellSelectionIndicators[cellUID]
- [cellColumn];
+ var cellIndicator:Object = cellSelectionIndicators[cellUID][cellColumn];
if (cellIndicator)
{
tmpMask = makeMask();
@@ -4812,10 +4811,10 @@ public class AdvancedDataGrid extends Ad
// Also check if _userMaxHorizontalScrollPosition is greater than 0.
if (!wordWrap && initialized)
{
- super.maxHorizontalScrollPosition =
+ maxHorizontalScrollPosition =
_userMaxHorizontalScrollPosition > 0 ?
_userMaxHorizontalScrollPosition + getIndent() :
- super.maxHorizontalScrollPosition;
+ maxHorizontalScrollPosition;
}
//restore ItemSizeChangeNotification flag
listContent.allowItemSizeChangeNotification = variableRowHeight;
@@ -7766,16 +7765,19 @@ public class AdvancedDataGrid extends Ad
if (rowData)
{
var rowIndicators:Object = cellSelectionIndicators[rowData.uid];
- var columnIndicator:Sprite;
- if (rowIndicators && (columnIndicator = rowIndicators[columnIndex.toString()]))
+ if (rowIndicators)
{
- o = columnIndicator;
- if (o.parent)
- o.parent.removeChild(o);
-
- delete rowIndicators[columnIndex.toString()];
- if (!atLeastOneProperty(rowIndicators))
- delete cellSelectionIndicators[rowData.uid];
+ var columnIndicator:Sprite = rowIndicators[columnIndex.toString()];
+ if(columnIndicator)
+ {
+ o = columnIndicator;
+ if (o.parent)
+ o.parent.removeChild(o);
+
+ delete rowIndicators[columnIndex.toString()];
+ if (!atLeastOneProperty(rowIndicators))
+ delete cellSelectionIndicators[rowData.uid];
+ }
}
}
}
Modified: incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as?rev=1423864&r1=1423863&r2=1423864&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as Wed Dec 19 14:03:37 2012
@@ -3968,9 +3968,7 @@ public class AdvancedDataGridBaseEx exte
// Height is usually as tall is the items in the row, but not if
// it would extend below the bottom of listContent
- var height:Number = Math.min(height,
- listContent.height -
- y);
+ height = Math.min(height, listContent.height - y);
var g:Graphics = background.graphics;
g.clear();
@@ -7942,12 +7940,11 @@ public class AdvancedDataGridBaseEx exte
fm.setFocus(IFocusManagerComponent(itemEditorInstance));
fm.defaultButtonEnabled = false;
- var event:AdvancedDataGridEvent =
- new AdvancedDataGridEvent(AdvancedDataGridEvent.ITEM_FOCUS_IN);
- event.columnIndex = _editedItemPosition.columnIndex;
- event.rowIndex = _editedItemPosition.rowIndex;
- event.itemRenderer = itemEditorInstance;
- dispatchEvent(event);
+ var newEvent:AdvancedDataGridEvent = new AdvancedDataGridEvent(AdvancedDataGridEvent.ITEM_FOCUS_IN);
+ newEvent.columnIndex = _editedItemPosition.columnIndex;
+ newEvent.rowIndex = _editedItemPosition.rowIndex;
+ newEvent.itemRenderer = itemEditorInstance;
+ dispatchEvent(newEvent);
}
}
Modified: incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/OLAPDataGrid.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/OLAPDataGrid.as?rev=1423864&r1=1423863&r2=1423864&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/OLAPDataGrid.as (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/OLAPDataGrid.as Wed Dec 19 14:03:37 2012
@@ -985,9 +985,7 @@ public class OLAPDataGrid extends Advanc
// Height is usually as tall is the items in the row, but not if
// it would extend below the bottom of listContent
- var height:Number = Math.min(height,
- listContent.height -
- y);
+ height = Math.min(height, listContent.height - y);
var g:Graphics = background.graphics;
g.clear();
@@ -1064,6 +1062,7 @@ public class OLAPDataGrid extends Advanc
// 2. Call the grid's styleFunction
var newStyles:Object;
+ var styleFunction:Function = this.styleFunction;
if (styleFunction != null)
{
newStyles = styleFunction(rowPosn, colPosn, cellValue);
Modified: incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as?rev=1423864&r1=1423863&r2=1423864&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as Wed Dec 19 14:03:37 2012
@@ -6078,7 +6078,7 @@ public class AdvancedListBase extends Sc
return;
}
var bookmark:CursorBookmark = collectionIterator.bookmark;
- var index:int = bookmark.getViewIndex();
+ index = bookmark.getViewIndex();
if (index >= 0)
{
addSelectionData(uid, new ListBaseSelectionData(item, index, true));