Commit 65a90db8 authored by metzlerd's avatar metzlerd
Browse files

#2129711 Skinfo color values override graph specified values.

parent d96520c7
......@@ -83,8 +83,9 @@ class FrxRenderer {
}
$skin_data = Frx::Data()->getContext('skin');
$class = get_class($this);
if (isset($skin_data[$class])) {
$attributes = array_merge($attributes, $skin_data[$class]);
$attributes = array_merge($skin_data[$class], $attributes);
}
$classes = class_parents($this);
array_pop($classes);
......
......@@ -79,15 +79,6 @@ class FrxSVGGraph extends FrxChart {
function renderGraph($type, $options, $data) {
static $jsinc = FALSE;
// Default in Skin Options for Graph type
$skin = Frx::Data()->getContext('skin');
if (@is_array($skin['SVGGraph'][$type])) {
$skin_options = $skin['SVGGraph'][$type];
if (isset($skin['FrxSVGGraph'])) $skin_options = array_merge($skin['FrxSVGGraph'], $skin_options);
$options = array_merge($skin_option, $options);
}
if (!isset($options['scatter_2d']) && ($type == 'ScatterGraph' || $type=='MultiScatterGraph') && $this->xy_data && !isset($options['scatter_2d'])) {
$options['scatter_2d'] = TRUE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment