Skip to content

C
c3-closed
Commit 5c6a7d17 authored by Evgeny's avatar Evgeny
Browse files
Options

Fix markers

parent 86c08445
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 42 deletions
_SpecRunner.html 0 → 100644
View file @ 5c6a7d17
<!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="bower_components/async-buffer/index.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/markers-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 @ 5c6a7d17
......@@ -7,8 +7,10 @@
var c3_chart_fn, c3_chart_internal_fn;
var c3 = { version: "0.4.9" };
var c3init = function(module){
var c3init = function(module, _d3, _AsyncBuffer){
__filename__ = module.uri;
//d3 = _d3;
//AsyncBuffer = _AsyncBuffer;
return c3;
}
......@@ -3291,26 +3293,29 @@
return Math.abs(y - this.d3.mouse(that)[1]) < 30;
};
var marker_fn = (function() {
function pt(point){
if(isNaN(point.x + point.y)) return '';
return point.x+','+point.y;
}
function buildPath(points){
var path = create('path');
var d = '';
for(var i = 0; i<points.length; i++){
d += (points[i].action || 'L') + pt(points[i]);
}
path.attr('d', d);
return path;
}
c3_chart_internal_fn.marker_fn = function() {
var $$ = this;
var d3 = $$.d3;
function create(name){
return d3.select(document.createElementNS("http://www.w3.org/2000/svg", name));
}
function pt(point){
if(isNaN(point.x + point.y)) return '';
return point.x+','+point.y;
}
function buildPath(points){
var path = create('path');
var d = '';
for(var i = 0; i<points.length; i++){
d += (points[i].action || 'L') + pt(points[i]);
}
path.attr('d', d);
return path;
}
var serifThickness = 3;
return {
......@@ -3402,7 +3407,7 @@
]).style('stroke', 'none');
}
};
})();
};
c3_chart_internal_fn.setMarker = function(id, type){
var $$ = this;
......@@ -3455,10 +3460,10 @@
// If marker type isn't set at all, draw circle
if($$.config.marker_types[d.id] === undefined){
return marker_fn.circle($$.pointR(d, i)).node();
return $$.marker_fn().circle($$.pointR(d, i)).node();
}
var func = marker_fn[$$.config.marker_types[d.id]];
var func = $$.marker_fn().[$$.config.marker_types[d.id]];
return func($$.pointR(d, i), $$.color(d, i)).node();
};
......
src/core.js
View file @ 5c6a7d17
......@@ -2,8 +2,10 @@ var __filename__; // used in Node.js to get css file using path
var c3_chart_fn, c3_chart_internal_fn;
var c3 = { version: "0.4.9" };
var c3init = function(module){
var c3init = function(module, _d3, _AsyncBuffer){
__filename__ = module.uri;
//d3 = _d3;
//AsyncBuffer = _AsyncBuffer;
return c3;
}
......
src/marker.js
View file @ 5c6a7d17
var marker_fn = (function() {
function pt(point){
if(isNaN(point.x + point.y)) return '';
return point.x+','+point.y;
}
function buildPath(points){
var path = create('path');
var d = '';
for(var i = 0; i<points.length; i++){
d += (points[i].action || 'L') + pt(points[i]);
}
path.attr('d', d);
return path;
}
c3_chart_internal_fn.marker_fn = function() {
var $$ = this;
var d3 = $$.d3;
function create(name){
return d3.select(document.createElementNS("http://www.w3.org/2000/svg", name));
}
function pt(point){
if(isNaN(point.x + point.y)) return '';
return point.x+','+point.y;
}
function buildPath(points){
var path = create('path');
var d = '';
for(var i = 0; i<points.length; i++){
d += (points[i].action || 'L') + pt(points[i]);
}
path.attr('d', d);
return path;
}
var serifThickness = 3;
return {
......@@ -109,7 +112,7 @@ var marker_fn = (function() {
]).style('stroke', 'none');
}
};
})();
};
c3_chart_internal_fn.setMarker = function(id, type){
var $$ = this;
......@@ -162,10 +165,10 @@ c3_chart_internal_fn.getMarker = function(d, i){
// If marker type isn't set at all, draw circle
if($$.config.marker_types[d.id] === undefined){
return marker_fn.circle($$.pointR(d, i)).node();
return $$.marker_fn().circle($$.pointR(d, i)).node();
}
var func = marker_fn[$$.config.marker_types[d.id]];
var func = $$.marker_fn().[$$.config.marker_types[d.id]];
return func($$.pointR(d, i), $$.color(d, i)).node();
};
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