Browse Source

Merge branch 'SegFaultx64-master'

pull/1069/merge
Masayuki Tanaka 10 years ago
parent
commit
891ab06f57
  1. 6
      c3.js
  2. 2
      c3.min.js
  3. 6
      src/api.load.js

6
c3.js

@ -5972,6 +5972,12 @@
config.data_axes[id] = args.axes[id];
});
}
// update colors if exists
if ('colors' in args) {
Object.keys(args.colors).forEach(function (id) {
config.data_colors[id] = args.colors[id];
});
}
// use cache if exists
if ('cacheIds' in args && $$.hasCaches(args.cacheIds)) {
$$.load($$.getCaches(args.cacheIds), args.done);

2
c3.min.js vendored

File diff suppressed because one or more lines are too long

6
src/api.load.js

@ -20,6 +20,12 @@ c3_chart_fn.load = function (args) {
config.data_axes[id] = args.axes[id];
});
}
// update colors if exists
if ('colors' in args) {
Object.keys(args.colors).forEach(function (id) {
config.data_colors[id] = args.colors[id];
});
}
// use cache if exists
if ('cacheIds' in args && $$.hasCaches(args.cacheIds)) {
$$.load($$.getCaches(args.cacheIds), args.done);

Loading…
Cancel
Save