You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/08/15 15:42:31 UTC
[1/4] git commit: [flex-sdk] [refs/heads/develop] - Revert "Fixed
issue with data grid using an array of strings creating a column called
length"
Updated Branches:
refs/heads/develop dc9f5c67f -> 52d831085
Revert "Fixed issue with data grid using an array of strings creating a column called length"
This reverts commit c6b5dc7a44a9f1b9d650023cd1774305de0b3bd7.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/18588f08
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/18588f08
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/18588f08
Branch: refs/heads/develop
Commit: 18588f0829b2377d2d08385f9a21ecbc7fbf90fd
Parents: dc9f5c6
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Aug 15 07:41:50 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Aug 15 07:41:50 2013 +1000
----------------------------------------------------------------------
frameworks/projects/mx/src/mx/controls/DataGrid.as | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/18588f08/frameworks/projects/mx/src/mx/controls/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DataGrid.as b/frameworks/projects/mx/src/mx/controls/DataGrid.as
index 087ef90..30f20e7 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -2770,13 +2770,9 @@ public class DataGrid extends DataGridBase implements IIMESupport
iteratorValid = false;
return;
}
-
- var excludes:Array = ["uid", "mx_internal_uid"];
- if (iterator && iterator.current is String)
- excludes.push("length");
-
var info:Object =
- ObjectUtil.getClassInfo(iterator.current, excludes);
+ ObjectUtil.getClassInfo(iterator.current,
+ ["uid", "mx_internal_uid"]);
if (info)
cols = info.properties;
@@ -2801,7 +2797,7 @@ public class DataGrid extends DataGridBase implements IIMESupport
// this is an old recordset - use its columns
var n:int = cols.length;
var colName:Object;
- if (n == 0 && iterator.current) {
+ if (n == 0) {
col = new DataGridColumn();
newCols.push(col);
}
[3/4] git commit: [flex-sdk] [refs/heads/develop] - Revert "Fixed
issue (RTEs) with editable data grid when it has an array of simple values
(Number, String etc)"
Posted by jm...@apache.org.
Revert "Fixed issue (RTEs) with editable data grid when it has an array of simple values (Number, String etc)"
This reverts commit 56c55d0f3e6d77f38823a1204321d09c6017f9e2.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/47a0f17c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/47a0f17c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/47a0f17c
Branch: refs/heads/develop
Commit: 47a0f17c48b9751dd01790093b3b9ed02a07ed6f
Parents: 0e1cbf1
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Aug 15 07:52:14 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Aug 15 07:52:14 2013 +1000
----------------------------------------------------------------------
.../src/mx/controls/AdvancedDataGridBaseEx.as | 59 +++++++-------------
1 file changed, 20 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/47a0f17c/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
index 627ca9a..9c3a3f4 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
@@ -3397,7 +3397,7 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
ObjectUtil.getClassInfo(iterator.current,
["uid", "mx_internal_uid"]);
- if (info)
+ if(info)
cols = info.properties;
}
@@ -3420,21 +3420,15 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
// this is an old recordset - use its columns
var n:int = cols.length;
var colName:Object;
- if (n == 0) {
- col = new AdvancedDataGridColumn();
- newCols.push(col);
- }
- else {
- for (var i:int = 0; i < n; i++)
- {
- colName = cols[i];
- if (colName is QName)
- colName = QName(colName).localName;
- col = new AdvancedDataGridColumn();
- col.dataField = String(colName);
- newCols.push(col);
- }
- }
+ for (var i:int = 0; i < n; i++)
+ {
+ colName = cols[i];
+ if (colName is QName)
+ colName = QName(colName).localName;
+ col = new AdvancedDataGridColumn();
+ col.dataField = String(colName);
+ newCols.push(col);
+ }
}
columns = newCols;
generatedColumns = true;
@@ -4023,7 +4017,7 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
var g:Graphics = background.graphics;
g.clear();
- if (columnIndex >= lockedColumnCount &&
+ if(columnIndex >= lockedColumnCount &&
columnIndex < lockedColumnCount + horizontalScrollPosition)
return;
@@ -4041,9 +4035,8 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
// 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 = 0;
- if (lastRow)
- height = Math.min(lastRow.y + lastRow.height, listContent.height - yy);
+ var height:Number = Math.min(lastRow.y + lastRow.height,
+ listContent.height - yy);
g.drawRect(xx, yy, headerInfo.headerItem.width, height);
g.endFill();
@@ -8009,8 +8002,8 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
var newData:Object = itemEditorInstance[_columns[event.columnIndex].editorDataField];
var property:String = _columns[event.columnIndex].dataField;
var data:Object = event.itemRenderer.data;
- var typeInfo:String = describeType(data).@name;
- for each (var variable:XML in describeType(data).variable)
+ var typeInfo:String = "";
+ for each(var variable:XML in describeType(data).variable)
{
if (property == variable.@name.toString())
{
@@ -8039,23 +8032,11 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
if (!(newData is int))
newData = Number(newData);
}
- if (property == null)
- {
- if (data != newData)
- {
- bChanged = true;
- data = newData;
- }
- }
- else
- {
- if (data[property] != newData)
- {
- bChanged = true;
- data[property] = newData;
- }
- }
-
+ if (data[property] != newData)
+ {
+ bChanged = true;
+ data[property] = newData;
+ }
if (bChanged && !(data is IPropertyChangeNotifier))
{
collection.itemUpdated(data, property);
[4/4] git commit: [flex-sdk] [refs/heads/develop] - Fix null checks
Posted by jm...@apache.org.
Fix null checks
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/52d83108
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/52d83108
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/52d83108
Branch: refs/heads/develop
Commit: 52d831085914ff7af84bbde7491ef292fa43d113
Parents: 47a0f17
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Aug 15 23:41:41 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Aug 15 23:41:41 2013 +1000
----------------------------------------------------------------------
frameworks/projects/mx/src/mx/controls/DataGrid.as | 4 ++--
.../mx/src/mx/controls/dataGridClasses/DataGridBase.as | 2 +-
.../mx/src/mx/controls/dataGridClasses/DataGridColumn.as | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/52d83108/frameworks/projects/mx/src/mx/controls/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DataGrid.as b/frameworks/projects/mx/src/mx/controls/DataGrid.as
index 34145e3..73800df 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -1991,7 +1991,7 @@ public class DataGrid extends DataGridBase implements IIMESupport
{
var rowData:DataGridListData = DataGridListData(makeListData(data, itemToUID(data), 0, c.colNum, c));
if (item is IDropInListItemRenderer)
- IDropInListItemRenderer(item).listData = data ? rowData : null;
+ IDropInListItemRenderer(item).listData = (data != null) ? rowData : null;
item.data = data;
item.explicitWidth = getWidthOfItem(item, c);
UIComponentGlobals.layoutManager.validateClient(item, true);
@@ -4576,7 +4576,7 @@ public class DataGrid extends DataGridBase implements IIMESupport
if (!editable)
return false;
- if (!data)
+ if (data == null)
return false;
return true;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/52d83108/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridBase.as b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridBase.as
index 3e367ed..b944685 100644
--- a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridBase.as
+++ b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridBase.as
@@ -1569,7 +1569,7 @@ public class DataGridBase extends ListBase implements IFontContextComponent
factory = c.getItemRendererFactory(forHeader, data);
if (!factory)
{
- if (!data)
+ if (data == null)
factory = nullItemRenderer;
if (!factory)
factory = itemRenderer;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/52d83108/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as
index 9c80144..2411cbb 100644
--- a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as
+++ b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as
@@ -1691,7 +1691,7 @@ public class DataGridColumn extends CSSStyleDeclaration implements IIMESupport
*/
public function itemToLabel(data:Object):String
{
- if (!data)
+ if (data == null)
return " ";
if (labelFunction != null)
@@ -1704,10 +1704,10 @@ public class DataGridColumn extends CSSStyleDeclaration implements IIMESupport
{
try
{
- if ( !hasComplexFieldName )
- data = data[dataField];
+ if (!hasComplexFieldName)
+ data = data[dataField];
else
- data = deriveComplexColumnData( data );
+ data = deriveComplexColumnData(data);
}
catch(e:Error)
{
@@ -1853,7 +1853,7 @@ public class DataGridColumn extends CSSStyleDeclaration implements IIMESupport
return _contextHeaderRenderer;
}
- if (!data)
+ if (data == null)
{
if (!_contextNullItemRenderer)
_contextNullItemRenderer = replaceItemRendererFactory(nullItemRenderer);
[2/4] git commit: [flex-sdk] [refs/heads/develop] - Revert "Fixed
issue (RTEs) with editable data grid when it has an array of simple values
(Number, String etc)"
Posted by jm...@apache.org.
Revert "Fixed issue (RTEs) with editable data grid when it has an array of simple values (Number, String etc)"
This reverts commit e47f993773fd5dd7e5c636068d4e9ddd37d3ba98.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/0e1cbf14
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/0e1cbf14
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/0e1cbf14
Branch: refs/heads/develop
Commit: 0e1cbf1466cfb490305872ff3277f5bc901660e5
Parents: 18588f0
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Aug 15 07:51:55 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Aug 15 07:51:55 2013 +1000
----------------------------------------------------------------------
.../projects/mx/src/mx/controls/DataGrid.as | 67 ++++++++------------
1 file changed, 27 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0e1cbf14/frameworks/projects/mx/src/mx/controls/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DataGrid.as b/frameworks/projects/mx/src/mx/controls/DataGrid.as
index 30f20e7..34145e3 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -2797,21 +2797,15 @@ public class DataGrid extends DataGridBase implements IIMESupport
// this is an old recordset - use its columns
var n:int = cols.length;
var colName:Object;
- if (n == 0) {
- col = new DataGridColumn();
- newCols.push(col);
- }
- else {
- for (var i:int = 0; i < n; i++)
- {
- colName = cols[i];
- if (colName is QName)
- colName = QName(colName).localName;
- col = new DataGridColumn();
- col.dataField = String(colName);
- newCols.push(col);
- }
- }
+ for (var i:int = 0; i < n; i++)
+ {
+ colName = cols[i];
+ if (colName is QName)
+ colName = QName(colName).localName;
+ col = new DataGridColumn();
+ col.dataField = String(colName);
+ newCols.push(col);
+ }
}
columns = newCols;
@@ -5332,8 +5326,8 @@ public class DataGrid extends DataGridBase implements IIMESupport
var newData:Object = itemEditorInstance[_columns[event.columnIndex].editorDataField];
var property:String = _columns[event.columnIndex].dataField;
var data:Object = event.itemRenderer.data;
- var typeInfo:String = describeType(data).@name;
- for each (var variable:XML in describeType(data).variable)
+ var typeInfo:String = "";
+ for each(var variable:XML in describeType(data).variable)
{
if (property == variable.@name.toString())
{
@@ -5365,12 +5359,9 @@ public class DataGrid extends DataGridBase implements IIMESupport
/** Old code assumed that the property would be a simply name that could be dereferenced
* through array notation. Using a method call here provides, minimally, an override
* point where developers could extend this functionality in their own datagrid subclass **/
- if (getCurrentDataValue(data, property) !== newData)
+ if (property != null && getCurrentDataValue( data, property ) !== newData)
{
- bChanged = setNewValue(data, property, newData, event.columnIndex);
-
- if (property == null)
- collection[event.rowIndex] = newData;
+ bChanged = setNewValue( data, property, newData, event.columnIndex );
}
if (bChanged && !(data is IPropertyChangeNotifier || data is XML))
{
@@ -5423,9 +5414,9 @@ public class DataGrid extends DataGridBase implements IIMESupport
/**
* @private
*/
- protected function isComplexColumn(property:String):Boolean
+ protected function isComplexColumn( property:String ):Boolean
{
- return property != null && property.indexOf( "." ) != -1;
+ return ( property.indexOf( "." ) != -1 );
}
//Gets the reference to the parent object where a property will be updated
@@ -5450,37 +5441,33 @@ public class DataGrid extends DataGridBase implements IIMESupport
/**
* @private
*/
- protected function getCurrentDataValue(data:Object, property:String):String
+ protected function getCurrentDataValue( data:Object, property:String ):String
{
- if (property == null)
- return String(data);
-
- if (!isComplexColumn(property))
- return data[property];
+ if ( !isComplexColumn( property ) )
+ return data[ property ];
- var complexFieldNameComponents:Array = property.split(".");
- var obj:Object = deriveComplexFieldReference(data, complexFieldNameComponents);
+ var complexFieldNameComponents:Array = property.split( "." );
+ var obj:Object = deriveComplexFieldReference( data, complexFieldNameComponents );
- return String(obj);
+ return String( obj );
}
//Passing all of these parameters as it basically allows everything you would need to subclass for all sorts of fun implementations
/**
* @private
*/
- protected function setNewValue(data:Object, property:String, value:Object, columnIndex:int):Boolean
+ protected function setNewValue( data:Object, property:String, value:Object, columnIndex:int ):Boolean
{
- if (!isComplexColumn(property))
+ if ( !isComplexColumn( property ) )
{
- if (property != null)
- data[property] = value;
+ data[ property ] = value;
}
else
{
- var complexFieldNameComponents:Array = property.split(".");
+ var complexFieldNameComponents:Array = property.split( "." );
var lastProp:String = complexFieldNameComponents.pop();
- var parent:Object = deriveComplexFieldReference(data, complexFieldNameComponents);
- parent[lastProp] = value;
+ var parent:Object = deriveComplexFieldReference( data, complexFieldNameComponents );
+ parent[ lastProp ] = value;
}
//The value they typed in is always converted to a string, but is the value actually a string in the dataprovider?