Browse Source

Fix grid filtering to add and remove - #720

pull/729/head
Masayuki Tanaka 10 years ago
parent
commit
12cb277f40
  1. 2
      c3.js
  2. 2
      c3.min.js
  3. 71
      spec/api.grid-spec.js
  4. 2
      src/grid.js

2
c3.js

@ -3507,7 +3507,7 @@
return params ? function (line) { return params ? function (line) {
var found = false; var found = false;
[].concat(params).forEach(function (param) { [].concat(params).forEach(function (param) {
if ((('value' in param && line.value === params.value) || ('class' in param && line['class'] === params['class']))) { if ((('value' in param && line.value === param.value) || ('class' in param && line['class'] === param['class']))) {
found = true; found = true;
} }
}); });

2
c3.min.js vendored

File diff suppressed because one or more lines are too long

71
spec/api.grid-spec.js

@ -0,0 +1,71 @@
var describe = window.describe,
expect = window.expect,
it = window.it,
beforeEach = window.beforeEach;
describe('c3 api grid', function () {
'use strict';
var chart, d3;
var args = {
data: {
columns: [
['data1', 30, 200, 100, 400, 150, 250]
]
}
};
beforeEach(function (done) {
chart = window.initChart(chart, args, done);
d3 = chart.internal.d3;
});
describe('ygrid.add and ygrid.remove', function () {
it('should update y grids', function (done) {
var main = chart.internal.main,
expectedGrids = [
{
value: 100,
text: 'Pressure Low'
},
{
value: 200,
text: 'Pressure High'
}
],
grids;
// Call ygrids.add
chart.ygrids.add(expectedGrids);
setTimeout(function () {
grids = main.selectAll('.c3-ygrid-line');
expect(grids.size()).toBe(expectedGrids.length);
grids.each(function (d, i) {
var y = +d3.select(this).select('line').attr('y1'),
text = d3.select(this).select('text').text(),
expectedY = Math.round(chart.internal.y(expectedGrids[i].value)),
expectedText = expectedGrids[i].text;
expect(y).toBe(expectedY);
expect(text).toBe(expectedText);
});
// Call ygrids.remove
chart.ygrids.remove(expectedGrids);
setTimeout(function () {
grids = main.selectAll('.c3-ygrid-line');
expect(grids.size()).toBe(0);
}, 500);
}, 500);
setTimeout(function () {
done();
}, 1200);
});
});
});

2
src/grid.js

@ -203,7 +203,7 @@ c3_chart_internal_fn.getGridFilterToRemove = function (params) {
return params ? function (line) { return params ? function (line) {
var found = false; var found = false;
[].concat(params).forEach(function (param) { [].concat(params).forEach(function (param) {
if ((('value' in param && line.value === params.value) || ('class' in param && line['class'] === params['class']))) { if ((('value' in param && line.value === param.value) || ('class' in param && line['class'] === param['class']))) {
found = true; found = true;
} }
}); });

Loading…
Cancel
Save