Fix conflict

3827c569 · Masayuki Tanaka · 34508a2d · 8b75e705 · 3827c569 · 3827c569
Commit 3827c569 authored Nov 20, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

c3.js c3.js +1 -1

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

api.data.js src/api.data.js +1 -1

No files found.
--- a/c3.js
+++ b/c3.js
@@ -6246,7 +6246,7 @@
    };
    c3_chart_fn.data.values = function (targetId) {
        var target = this.data(targetId);
-        return target ? target.values.map(function (d) { return d.value; }) : null;
+        return target[0] ? target[0].values.map(function (d) { return d.value; }) : null;
    };
    c3_chart_fn.data.names = function (names) {
        return this.internal.updateDataAttributes('names', names);

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/api.data.js
+++ b/src/api.data.js
@@ -9,7 +9,7 @@ c3_chart_fn.data.shown = function (targetId) {
 };
 c3_chart_fn.data.values = function (targetId) {
    var target = this.data(targetId);
-    return target ? target.values.map(function (d) { return d.value; }) : null;
+    return target[0] ? target[0].values.map(function (d) { return d.value; }) : null;
 };
 c3_chart_fn.data.names = function (names) {
    return this.internal.updateDataAttributes('names', names);