Browse Source

Update #1275

pull/1177/merge
Masayuki Tanaka 9 years ago
parent
commit
0d9f1e2a79
  1. 12
      c3.js
  2. 8
      c3.min.js
  3. 15
      src/shape.js

12
c3.js

@ -2796,7 +2796,17 @@
var values = $$.isStepType(d) ? $$.convertValuesToStep(t.values) : t.values;
if (t.id === d.id || indices[t.id] !== indices[d.id]) { return; }
if (targetIds.indexOf(t.id) < targetIds.indexOf(d.id)) {
if (values[i].value * d.value >= 0) {
// check if the x values line up
if (typeof values[i] === 'undefined' || values[i].x !== d.x) {
// if not, try to find the value that does line up
i = -1;
values.forEach(function (v, j) {
if (v.x === d.x) {
i = j;
}
});
}
if (i in values && values[i].value * d.value >= 0) {
offset += scale(values[i].value) - y0;
}
}

8
c3.min.js vendored

File diff suppressed because one or more lines are too long

15
src/shape.js

@ -42,24 +42,19 @@ c3_chart_internal_fn.getShapeOffset = function (typeFilter, indices, isSub) {
if (t.id === d.id || indices[t.id] !== indices[d.id]) { return; }
if (targetIds.indexOf(t.id) < targetIds.indexOf(d.id)) {
// check if the x values line up
if (typeof values[i] === 'undefined' ||
(values[i].x !== d.x) && (values[i].x - d.x !== 0)) {
if (typeof values[i] === 'undefined' || values[i].x !== d.x) {
// if not, try to find the value that does line up
i = -1;
for (var j in values) {
if ((values[j].x === d.x) || (values[j].x - d.x === 0)) {
values.forEach(function (v, j) {
if (v.x === d.x) {
i = j;
break;
}
}
});
}
if (i in values) {
if (values[i].value * d.value >= 0) {
if (i in values && values[i].value * d.value >= 0) {
offset += scale(values[i].value) - y0;
}
}
}
});
return offset;
};

Loading…
Cancel
Save