You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/12/15 00:55:56 UTC
git commit: [flex-sdk] [refs/heads/release4.15.0] - Revert "Fix for
https://issues.apache.org/jira/browse/FLEX-34909 (Embedded fonts not working
on charts)"
Repository: flex-sdk
Updated Branches:
refs/heads/release4.15.0 b36f9d6f2 -> 5c7e0f80c
Revert "Fix for https://issues.apache.org/jira/browse/FLEX-34909 (Embedded fonts not working on charts)"
This reverts commit 636859085bbd6794ce6b3950727e20c5aa2a665d.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5c7e0f80
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5c7e0f80
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5c7e0f80
Branch: refs/heads/release4.15.0
Commit: 5c7e0f80cfa8408c263c0a9cf025a8c816da0dd5
Parents: b36f9d6
Author: Alex Harui <ah...@apache.org>
Authored: Sat Dec 12 23:53:36 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Dec 12 23:53:36 2015 -0800
----------------------------------------------------------------------
frameworks/projects/charts/charts.css | 2 +-
.../projects/charts/src/mx/charts/series/BarSeries.as | 11 +++++++++--
.../projects/charts/src/mx/charts/series/ColumnSeries.as | 11 +++++++++--
3 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c7e0f80/frameworks/projects/charts/charts.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/charts.css b/frameworks/projects/charts/charts.css
index 94cb064..02b374f 100644
--- a/frameworks/projects/charts/charts.css
+++ b/frameworks/projects/charts/charts.css
@@ -211,7 +211,7 @@ PieChart
AxisRenderer
{
- labelClass: ClassReference("mx.controls.Label");
+ labelClass: ClassReference("spark.components.Label");
canDropLabels : ClassReference(null);
canStagger : true;
labelGap : 3;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c7e0f80/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
index 7fb224a..864e37e 100644
--- a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
@@ -280,8 +280,15 @@ public class BarSeries extends Series implements IStackable2, IBar
var labelClass:Class = getStyle("labelClass");
if(labelClass == null)
{
- labelClass = Class(ApplicationDomain.currentDomain.
- getDefinition("mx.controls::Label"));
+ try{
+ labelClass = Class(ApplicationDomain.currentDomain.
+ getDefinition("spark.components::Label"));
+ }
+ catch(e:Error)
+ {
+ labelClass = Class(ApplicationDomain.currentDomain.
+ getDefinition("mx.controls::Label"));
+ }
}
return labelClass;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5c7e0f80/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
index 05e5eee..bf81896 100644
--- a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
@@ -280,8 +280,15 @@ public class ColumnSeries extends Series implements IColumn,IStackable2
if(labelClass == null)
{
- labelClass = Class(ApplicationDomain.currentDomain.
- getDefinition("mx.controls::Label"));
+ try{
+ labelClass = Class(ApplicationDomain.currentDomain.
+ getDefinition("spark.components::Label"));
+ }
+ catch(e:Error)
+ {
+ labelClass = Class(ApplicationDomain.currentDomain.
+ getDefinition("mx.controls::Label"));
+ }
}
return labelClass;
}