Browse Source

Fix conflict

pull/302/merge
Masayuki Tanaka 11 years ago
parent
commit
ded337708b
  1. 1
      c3.js
  2. 2
      c3.min.js

1
c3.js

@ -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;
}; };

2
c3.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save