Browse Source

Fix data.values interface

pull/742/head
Masayuki Tanaka 10 years ago
parent
commit
a66beb31eb
  1. 12
      c3.js
  2. 2
      c3.min.js
  3. 5
      spec/api.data-spec.js
  4. 12
      src/api.data.js

12
c3.js

@ -6241,12 +6241,16 @@
return [].concat(targetIds).indexOf(t.id) >= 0; return [].concat(targetIds).indexOf(t.id) >= 0;
}); });
}; };
c3_chart_fn.data.shown = function (targetId) { c3_chart_fn.data.shown = function (targetIds) {
return this.internal.filterTargetsToShow(this.data(targetId)); return this.internal.filterTargetsToShow(this.data(targetIds));
}; };
c3_chart_fn.data.values = function (targetId) { c3_chart_fn.data.values = function (targetId) {
var target = this.data(targetId); var targets, values = null;
return target[0] ? target[0].values.map(function (d) { return d.value; }) : null; if (targetId) {
targets = this.data(targetId);
values = targets[0] ? targets[0].values.map(function (d) { return d.value; }) : null;
}
return values;
}; };
c3_chart_fn.data.names = function (names) { c3_chart_fn.data.names = function (names) {
return this.internal.updateDataAttributes('names', names); return this.internal.updateDataAttributes('names', names);

2
c3.min.js vendored

File diff suppressed because one or more lines are too long

5
spec/api.data-spec.js

@ -87,6 +87,11 @@ describe('c3 api data', function () {
}); });
}); });
it('should return null when no args', function () {
var values = chart.data.values();
expect(values).toBeNull();
});
}); });
describe('data.names()', function () { describe('data.names()', function () {

12
src/api.data.js

@ -4,12 +4,16 @@ c3_chart_fn.data = function (targetIds) {
return [].concat(targetIds).indexOf(t.id) >= 0; return [].concat(targetIds).indexOf(t.id) >= 0;
}); });
}; };
c3_chart_fn.data.shown = function (targetId) { c3_chart_fn.data.shown = function (targetIds) {
return this.internal.filterTargetsToShow(this.data(targetId)); return this.internal.filterTargetsToShow(this.data(targetIds));
}; };
c3_chart_fn.data.values = function (targetId) { c3_chart_fn.data.values = function (targetId) {
var target = this.data(targetId); var targets, values = null;
return target[0] ? target[0].values.map(function (d) { return d.value; }) : null; if (targetId) {
targets = this.data(targetId);
values = targets[0] ? targets[0].values.map(function (d) { return d.value; }) : null;
}
return values;
}; };
c3_chart_fn.data.names = function (names) { c3_chart_fn.data.names = function (names) {
return this.internal.updateDataAttributes('names', names); return this.internal.updateDataAttributes('names', names);

Loading…
Cancel
Save