playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix conflict

pull/703/head
Masayuki Tanaka 10 years ago
parent
02e3de23a5 90b9d3d283
commit
78a21e78f6
3 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      c3.js
  2. 2
      c3.min.js
  3. 2
      src/text.js

2
c3.js
Unescape View File

@ -3125,7 +3125,7 @@
.style("fill", function (d) { return $$.color(d); })
.style("fill-opacity", 0);
$$.mainText
.text(function (d, i) { return $$.formatByAxisId($$.getAxisId(d.id))(d.value, d.id, i); });
.text(function (d, i, j) { return $$.formatByAxisId($$.getAxisId(d.id))(d.value, d.id, i, j); });
$$.mainText.exit()
.transition().duration(durationForExit)
.style('fill-opacity', 0)

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/text.js
Unescape View File

@ -32,7 +32,7 @@ c3_chart_internal_fn.redrawText = function (durationForExit) {
.style("fill", function (d) { return $$.color(d); })
.style("fill-opacity", 0);
$$.mainText
.text(function (d, i) { return $$.formatByAxisId($$.getAxisId(d.id))(d.value, d.id, i); });
.text(function (d, i, j) { return $$.formatByAxisId($$.getAxisId(d.id))(d.value, d.id, i, j); });
$$.mainText.exit()
.transition().duration(durationForExit)
.style('fill-opacity', 0)

Write Preview
Loading…
Cancel
Save