Merge branch 'SegFaultx64-master'

891ab06f · Masayuki Tanaka · bc2318bd · 8c9d72e9 · 891ab06f · 891ab06f
Commit 891ab06f authored Mar 16, 2015 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

c3.js c3.js +6 -0

c3.min.js c3.min.js +0 -0

api.load.js src/api.load.js +6 -0

No files found.
--- a/c3.js
+++ b/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);

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/api.load.js
+++ b/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);