|
|
@ -1684,7 +1684,7 @@ |
|
|
|
var $$ = this, name; |
|
|
|
var $$ = this, name; |
|
|
|
if (data) { |
|
|
|
if (data) { |
|
|
|
name = $$.config.data_names[data.id]; |
|
|
|
name = $$.config.data_names[data.id]; |
|
|
|
data.name = name ? name : data.id; |
|
|
|
data.name = name !== undefined ? name : data.id; |
|
|
|
} |
|
|
|
} |
|
|
|
return data; |
|
|
|
return data; |
|
|
|
}; |
|
|
|
}; |
|
|
@ -3818,6 +3818,8 @@ |
|
|
|
|
|
|
|
|
|
|
|
value = valueFormat(d[i].value, d[i].ratio, d[i].id, d[i].index); |
|
|
|
value = valueFormat(d[i].value, d[i].ratio, d[i].id, d[i].index); |
|
|
|
if (value !== undefined) { |
|
|
|
if (value !== undefined) { |
|
|
|
|
|
|
|
// Skip elements when their name is set to null
|
|
|
|
|
|
|
|
if (d[i].name === null) { continue; } |
|
|
|
name = nameFormat(d[i].name, d[i].ratio, d[i].id, d[i].index); |
|
|
|
name = nameFormat(d[i].name, d[i].ratio, d[i].id, d[i].index); |
|
|
|
bgcolor = $$.levelColor ? $$.levelColor(d[i].value) : color(d[i].id); |
|
|
|
bgcolor = $$.levelColor ? $$.levelColor(d[i].value) : color(d[i].id); |
|
|
|
|
|
|
|
|
|
|
@ -4011,6 +4013,11 @@ |
|
|
|
var withTransition, withTransitionForTransform; |
|
|
|
var withTransition, withTransitionForTransform; |
|
|
|
var texts, rects, tiles, background; |
|
|
|
var texts, rects, tiles, background; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Skip elements when their name is set to null
|
|
|
|
|
|
|
|
targetIds = targetIds.filter(function(id) { |
|
|
|
|
|
|
|
return !isDefined(config.data_names[id]) || config.data_names[id] !== null; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
options = options || {}; |
|
|
|
options = options || {}; |
|
|
|
withTransition = getOption(options, "withTransition", true); |
|
|
|
withTransition = getOption(options, "withTransition", true); |
|
|
|
withTransitionForTransform = getOption(options, "withTransitionForTransform", true); |
|
|
|
withTransitionForTransform = getOption(options, "withTransitionForTransform", true); |
|
|
|