Commit 7fb248e5 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Merge branch 'master' of https://github.com/SegFaultx64/c3 into SegFaultx64-master

parents bc2318bd 94009b24
......@@ -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);
......
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