Skip to content

C
c3-closed
Commit e2a3eb31 authored by Дмитрий Никулин's avatar Дмитрий Никулин
Browse files
Options

Fix bug when legendText was not updated instantly

parent af09e567
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 2 deletions
_SpecRunner.html 0 → 100644
View file @ e2a3eb31
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>Jasmine Spec Runner</title>
<link rel="shortcut icon" type="image/png" href=".grunt/grunt-contrib-jasmine/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href=".grunt/grunt-contrib-jasmine/jasmine.css">
<link rel="stylesheet" type="text/css" href="c3.css">
</head>
<body>
<script src=".grunt/grunt-contrib-jasmine/es5-shim.js"></script>
<script src=".grunt/grunt-contrib-jasmine/jasmine.js"></script>
<script src=".grunt/grunt-contrib-jasmine/jasmine-html.js"></script>
<script src=".grunt/grunt-contrib-jasmine/json2.js"></script>
<script src=".grunt/grunt-contrib-jasmine/boot.js"></script>
<script src="bower_components/d3/d3.js"></script>
<script src="spec/c3-helper.js"></script>
<script src="c3.js"></script>
<script src="spec/api.chart-spec.js"></script>
<script src="spec/api.color-spec.js"></script>
<script src="spec/api.data-spec.js"></script>
<script src="spec/api.grid-spec.js"></script>
<script src="spec/api.load-spec.js"></script>
<script src="spec/api.zoom-spec.js"></script>
<script src="spec/arc-spec.js"></script>
<script src="spec/axis-spec.js"></script>
<script src="spec/c3-spec.js"></script>
<script src="spec/class-spec.js"></script>
<script src="spec/core-spec.js"></script>
<script src="spec/data-spec.js"></script>
<script src="spec/domain-spec.js"></script>
<script src="spec/grid-spec.js"></script>
<script src="spec/interaction-spec.js"></script>
<script src="spec/legend-spec.js"></script>
<script src="spec/shape.bar-spec.js"></script>
<script src="spec/shape.line-spec.js"></script>
<script src="spec/stacked-spec.js"></script>
<script src="spec/tooltip-spec.js"></script>
<script src="spec/type-spec.js"></script>
<script src="spec/zoom-spec.js"></script>
<script src=".grunt/grunt-contrib-jasmine/reporter.js"></script>
</body>
</html>
c3.js
View file @ e2a3eb31
......@@ -2379,6 +2379,16 @@
};
c3_chart_internal_fn.loadFromArgs = function (args) {
var $$ = this;
// Update config.data_names to avoid drawing id instead of header
if (args.headers) {
for (var id in args.headers) {
if (args.headers.hasOwnProperty(id)) {
$$.config.data_names[id] = args.headers[id];
}
}
}
if (args.data) {
$$.load($$.convertDataToTargets(args.data), args);
}
......@@ -7060,8 +7070,17 @@
c3_chart_fn.loadColumns = function(cols){
var $$ = this.internal;
var headers = {};
for (var i = 0; i < cols.length; i++) {
if (typeof cols[i].header !== 'undefined') {
headers[cols[i][0]] = cols[i].header;
}
}
$$.api.load({
columns: cols
columns: cols,
headers: headers
});
};
......
c3.min.js
View file @ e2a3eb31
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api.load.js
View file @ e2a3eb31
......@@ -83,8 +83,17 @@ c3_chart_fn.popFromColumn = function(id, amount){
c3_chart_fn.loadColumns = function(cols){
var $$ = this.internal;
var headers = {};
for (var i = 0; i < cols.length; i++) {
if (typeof cols[i].header !== 'undefined') {
headers[cols[i][0]] = cols[i].header;
}
}
$$.api.load({
columns: cols
columns: cols,
headers: headers
});
};
......
src/data.load.js
View file @ e2a3eb31
......@@ -36,6 +36,16 @@ c3_chart_internal_fn.load = function (targets, args) {
};
c3_chart_internal_fn.loadFromArgs = function (args) {
var $$ = this;
// Update config.data_names to avoid drawing id instead of header
if (args.headers) {
for (var id in args.headers) {
if (args.headers.hasOwnProperty(id)) {
$$.config.data_names[id] = args.headers[id];
}
}
}
if (args.data) {
$$.load($$.convertDataToTargets(args.data), args);
}
......
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