Browse Source

Update c3.min.js

pull/1207/head
Masayuki Tanaka 10 years ago
parent
commit
0efe6d7775
  1. 9
      c3.js
  2. 6
      c3.min.js
  3. 4
      src/legend.js

9
c3.js

@ -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);

6
c3.min.js vendored

File diff suppressed because one or more lines are too long

4
src/legend.js

@ -120,7 +120,9 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
var texts, rects, tiles, background; var texts, rects, tiles, background;
// Skip elements when their name is set to null // 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;}); 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);

Loading…
Cancel
Save