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 2014/03/20 00:45:41 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34132
further improvements.
Repository: flex-sdk
Updated Branches:
refs/heads/develop 2b2cc0cb6 -> cd2342053
FLEX-34132 further improvements.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c9d67583
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c9d67583
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c9d67583
Branch: refs/heads/develop
Commit: c9d675836c52ea042df375e07f622c5c6aed8656
Parents: 2b2cc0c
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Mar 20 09:46:20 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Mar 20 09:46:20 2014 +1100
----------------------------------------------------------------------
.../advancedDataGridClasses/AdvancedDataGridColumn.as | 11 ++++-------
.../AdvancedDataGridColumnGroup.as | 2 +-
.../mx/src/mx/controls/dataGridClasses/DataGridColumn.as | 11 ++++++-----
3 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c9d67583/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
index 36801b3..5d4c7cc 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
@@ -1778,13 +1778,10 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES
if (typeof(data) == "object" || typeof(data) == "xml")
{
- if (dataField != null)
- {
- if (dataField in data)
- data = data[dataField];
- else
- return " "; // stops "[object Object]" showing
- }
+ if (dataField != null && dataField in data)
+ data = data[dataField];
+ else
+ return " "; // stops "[object Object]" showing
}
if (data is String)
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c9d67583/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
index 98efd76..cfd692c 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
@@ -266,7 +266,7 @@ public class AdvancedDataGridColumnGroup extends AdvancedDataGridColumn
{
if (dataField != null)
{
- if (dataField in data)
+ if (dataField != null && dataField in data)
data = data[dataField];
else
data = null;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c9d67583/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 8a4a209..6ed783a 100644
--- a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as
+++ b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as
@@ -1743,12 +1743,13 @@ public class DataGridColumn extends CSSStyleDeclaration implements IIMESupport
{
data = deriveComplexColumnData(data);
}
- else if (dataField != null)
+ else if (dataField != null && dataField in data)
{
- if (dataField in data)
- data = data[dataField];
- else
- data = null;
+ data = data[dataField];
+ }
+ else
+ {
+ data = null;
}
}
[3/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34133 Fix
logic/ADG RTE in columnHeaderWordWrap
Posted by jm...@apache.org.
FLEX-34133 Fix logic/ADG RTE in columnHeaderWordWrap
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cd234205
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cd234205
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cd234205
Branch: refs/heads/develop
Commit: cd23420530383dddc0d02dbaa427979be8db1b06
Parents: 537ec24
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Mar 20 10:43:52 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Mar 20 10:43:52 2014 +1100
----------------------------------------------------------------------
.../AdvancedDataGridBase.as | 26 ++++++++++++--------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cd234205/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
index 5e4f33b..4a1b6d2 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
@@ -1693,12 +1693,15 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte
*/
mx_internal function columnHeaderWordWrap(c:AdvancedDataGridColumn):Boolean
{
- if (c.headerWordWrap == true)
- return true;
- if (c.headerWordWrap == false)
- return false;
-
- return headerWordWrap;
+ if (c)
+ {
+ if (c.headerWordWrap === undefined)
+ return headerWordWrap;
+ else
+ return c.headerWordWrap;
+ }
+
+ return headerWordWrap;
}
/**
@@ -1711,10 +1714,13 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte
*/
mx_internal function columnWordWrap(c:AdvancedDataGridColumn):Boolean
{
- if (c.wordWrap == true)
- return true;
- if (c.wordWrap == false)
- return false;
+ if (c)
+ {
+ if (c.wordWrap === undefined)
+ return wordWrap;
+ else
+ return c.wordWrap;
+ }
return wordWrap;
}
[2/3] git commit: [flex-sdk] [refs/heads/develop] - added
CONTRIBUTING to release packages
Posted by jm...@apache.org.
added CONTRIBUTING to release packages
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/537ec249
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/537ec249
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/537ec249
Branch: refs/heads/develop
Commit: 537ec2494b02bf5c8acb7716d7a4be8771688618
Parents: c9d6758
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Mar 20 10:05:00 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Mar 20 10:05:00 2014 +1100
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/537ec249/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6e17a1b..9e9a3a8 100644
--- a/build.xml
+++ b/build.xml
@@ -569,6 +569,7 @@
<include name="NOTICE"/>
<include name="README"/>
<include name="RELEASE_NOTES"/>
+ <include name="CONTRIBUTING"/>
</fileset>
</copy>