Skip to content

C
c3-closed
Commit ba997024 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix load API with JSON - #379

parent fed1ec4a
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 25 deletions
c3.js
View file @ ba997024
...@@ -1494,6 +1494,18 @@ ...@@ -1494,6 +1494,18 @@
} }
return x; return x;
} }
function convertUrlToData(url, mimeType, keys, done) {
var type = mimeType ? mimeType : 'csv';
d3.xhr(url, function (error, data) {
var d;
if (type === 'json') {
d = convertJsonToData(JSON.parse(data.response), keys);
} else {
d = convertCsvToData(data.response);
}
done(d);
});
}
function convertCsvToData(csv) { function convertCsvToData(csv) {
var rows = d3.csv.parseRows(csv), d; var rows = d3.csv.parseRows(csv), d;
if (rows.length === 1) { if (rows.length === 1) {
...@@ -4457,7 +4469,7 @@ ...@@ -4457,7 +4469,7 @@
load(convertDataToTargets(args.data), args); load(convertDataToTargets(args.data), args);
} }
else if (args.url) { else if (args.url) {
d3.csv(args.url, function (error, data) { convertUrlToData(args.url, args.mimeType, args.keys, function (data) {
load(convertDataToTargets(data), args); load(convertDataToTargets(data), args);
}); });
} }
...@@ -5296,21 +5308,8 @@ ...@@ -5296,21 +5308,8 @@
/*-- Load data and init chart with defined functions --*/ /*-- Load data and init chart with defined functions --*/
function initWithUrl(args) {
var type = args.mimeType ? args.mimeType : 'csv';
d3.xhr(args.url, function (error, data) {
var d;
if (type === 'json') {
d = convertJsonToData(JSON.parse(data.response), args.keys);
} else {
d = convertCsvToData(data.response);
}
init(d);
});
}
if (config.data.url) { if (config.data.url) {
initWithUrl(config.data); convertUrlToData(config.data.url, config.data.mimeType, config.data.keys, init);
} }
else if (config.data.json) { else if (config.data.json) {
init(convertJsonToData(config.data.json, config.data.keys)); init(convertJsonToData(config.data.json, config.data.keys));
......
c3.min.js
View file @ ba997024
This source diff could not be displayed because it is too large. You can view the blob instead.
htdocs/data/c3_test_2.json 0 → 100644
View file @ ba997024
{
"data1": [20, 40, 70, 50, 80, 30],
"data2": [180, 150, 200, 170, 220, 400],
"data3": [1200, 1210, 1250, 1300, 1280, 1000]
}
htdocs/samples/data_url.html
View file @ ba997024
...@@ -3,27 +3,39 @@ ...@@ -3,27 +3,39 @@
<link href="/css/c3.css" rel="stylesheet" type="text/css"> <link href="/css/c3.css" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<div id="chart1"></div> <div id="chart"></div>
<div id="chart2"></div>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script> <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="/js/c3.js"></script> <script src="/js/c3.js"></script>
<script> <script>
var chart1 = c3.generate({ var chart = c3.generate({
bindto: '#chart1',
data: { data: {
url: '/data/c3_test.csv' url: '/data/c3_test.csv'
} }
}); });
var chart2 = c3.generate({ setTimeout(function () {
bindto: '#chart2', chart.load({
data: { url: '/data/c3_test2.csv',
url: '/data/c3_test.json', });
}, 1000);
setTimeout(function () {
chart = c3.generate({
data: {
url: '/data/c3_test.json',
mimeType: 'json'
}
});
}, 2000);
setTimeout(function () {
chart.load({
url: '/data/c3_test_2.json',
mimeType: 'json' mimeType: 'json'
} });
}); }, 3000);
</script> </script>
</body> </body>
......
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