Repository: flex-sdk
Updated Branches:
refs/heads/develop 0b3a613ff -> 636859085
Fix for https://issues.apache.org/jira/browse/FLEX-34909 (Embedded fonts not working on charts)
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/63685908
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/63685908
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/63685908
Branch: refs/heads/develop
Commit: 636859085bbd6794ce6b3950727e20c5aa2a665d
Parents: 0b3a613
Author: OmPrakash Muppirala <bigosmallm@gmail.com>
Authored: Wed Sep 9 18:00:24 2015 -0700
Committer: OmPrakash Muppirala <bigosmallm@gmail.com>
Committed: Wed Sep 9 18:01:46 2015 -0700
----------------------------------------------------------------------
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, 5 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/63685908/frameworks/projects/charts/charts.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/charts.css b/frameworks/projects/charts/charts.css
index 02b374f..94cb064 100644
--- a/frameworks/projects/charts/charts.css
+++ b/frameworks/projects/charts/charts.css
@@ -211,7 +211,7 @@ PieChart
AxisRenderer
{
- labelClass: ClassReference("spark.components.Label");
+ labelClass: ClassReference("mx.controls.Label");
canDropLabels : ClassReference(null);
canStagger : true;
labelGap : 3;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/63685908/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 864e37e..7fb224a 100644
--- a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
@@ -280,15 +280,8 @@ public class BarSeries extends Series implements IStackable2, IBar
var labelClass:Class = getStyle("labelClass");
if(labelClass == null)
{
- try{
- labelClass = Class(ApplicationDomain.currentDomain.
- getDefinition("spark.components::Label"));
- }
- catch(e:Error)
- {
- labelClass = Class(ApplicationDomain.currentDomain.
- getDefinition("mx.controls::Label"));
- }
+ labelClass = Class(ApplicationDomain.currentDomain.
+ getDefinition("mx.controls::Label"));
}
return labelClass;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/63685908/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 bf81896..05e5eee 100644
--- a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
@@ -280,15 +280,8 @@ public class ColumnSeries extends Series implements IColumn,IStackable2
if(labelClass == null)
{
- try{
- labelClass = Class(ApplicationDomain.currentDomain.
- getDefinition("spark.components::Label"));
- }
- catch(e:Error)
- {
- labelClass = Class(ApplicationDomain.currentDomain.
- getDefinition("mx.controls::Label"));
- }
+ labelClass = Class(ApplicationDomain.currentDomain.
+ getDefinition("mx.controls::Label"));
}
return labelClass;
}
|