Skip to content

C
c3-closed
Commit ded33770 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix conflict

parents bdd98a47 5f3b9e63
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
c3.js
View file @ ded33770
...@@ -2302,6 +2302,7 @@ ...@@ -2302,6 +2302,7 @@
else { else {
if (ids.indexOf(id) < 0) { ids.push(id); } if (ids.indexOf(id) < 0) { ids.push(id); }
color = pattern[ids.indexOf(id) % pattern.length]; color = pattern[ids.indexOf(id) % pattern.length];
colors[id] = color;
} }
return callback instanceof Function ? callback(color, d) : color; return callback instanceof Function ? callback(color, d) : color;
}; };
......
c3.min.js
View file @ ded33770
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment