Skip to content

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

Fix typo

parent 5c6a7d17
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 111 deletions
_SpecRunner.html deleted 100644 → 0
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 @ cdae9823
...@@ -7,10 +7,8 @@ ...@@ -7,10 +7,8 @@
var c3_chart_fn, c3_chart_internal_fn; var c3_chart_fn, c3_chart_internal_fn;
var c3 = { version: "0.4.9" }; var c3 = { version: "0.4.9" };
var c3init = function(module, _d3, _AsyncBuffer){ var c3init = function(module){
__filename__ = module.uri; __filename__ = module.uri;
//d3 = _d3;
//AsyncBuffer = _AsyncBuffer;
return c3; return c3;
} }
...@@ -3293,8 +3291,13 @@ ...@@ -3293,8 +3291,13 @@
return Math.abs(y - this.d3.mouse(that)[1]) < 30; return Math.abs(y - this.d3.mouse(that)[1]) < 30;
}; };
c3_chart_internal_fn.markers = function() {
var d3 = this.d3;
function pt(point){ function pt(point){
if(isNaN(point.x + point.y)) return ''; if(isNaN(point.x + point.y)){
return '';
}
return point.x+','+point.y; return point.x+','+point.y;
} }
...@@ -3308,9 +3311,6 @@ ...@@ -3308,9 +3311,6 @@
return path; return path;
} }
c3_chart_internal_fn.marker_fn = function() {
var $$ = this;
var d3 = $$.d3;
function create(name){ function create(name){
return d3.select(document.createElementNS("http://www.w3.org/2000/svg", name)); return d3.select(document.createElementNS("http://www.w3.org/2000/svg", name));
...@@ -3407,7 +3407,7 @@ ...@@ -3407,7 +3407,7 @@
]).style('stroke', 'none'); ]).style('stroke', 'none');
} }
}; };
}; }
c3_chart_internal_fn.setMarker = function(id, type){ c3_chart_internal_fn.setMarker = function(id, type){
var $$ = this; var $$ = this;
...@@ -3460,10 +3460,10 @@ ...@@ -3460,10 +3460,10 @@
// If marker type isn't set at all, draw circle // If marker type isn't set at all, draw circle
if($$.config.marker_types[d.id] === undefined){ if($$.config.marker_types[d.id] === undefined){
return $$.marker_fn().circle($$.pointR(d, i)).node(); return $$.markers().circle($$.pointR(d, i)).node();
} }
var func = $$.marker_fn().[$$.config.marker_types[d.id]]; var func = $$.markers()[$$.config.marker_types[d.id]];
return func($$.pointR(d, i), $$.color(d, i)).node(); return func($$.pointR(d, i), $$.color(d, i)).node();
}; };
......
c3.min.js
View file @ cdae9823
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ cdae9823
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
"gitHead": "84e03109d9a590f9c8ef687c03d751f666080c6f", "gitHead": "84e03109d9a590f9c8ef687c03d751f666080c6f",
"readmeFilename": "README.md", "readmeFilename": "README.md",
"dependencies": { "dependencies": {
"d3": "3.5.15", "async-buffer": "3.0.0",
"async-buffer": "3.0.0" "css": "^2.2.1",
"d3": "3.5.15"
}, },
"devDependencies": { "devDependencies": {
"grunt": "1.0.1", "grunt": "1.0.1",
......
src/core.js
View file @ cdae9823
...@@ -2,10 +2,8 @@ var __filename__; // used in Node.js to get css file using path ...@@ -2,10 +2,8 @@ var __filename__; // used in Node.js to get css file using path
var c3_chart_fn, c3_chart_internal_fn; var c3_chart_fn, c3_chart_internal_fn;
var c3 = { version: "0.4.9" }; var c3 = { version: "0.4.9" };
var c3init = function(module, _d3, _AsyncBuffer){ var c3init = function(module){
__filename__ = module.uri; __filename__ = module.uri;
//d3 = _d3;
//AsyncBuffer = _AsyncBuffer;
return c3; return c3;
} }
......
src/marker.js
View file @ cdae9823
function pt(point){ c3_chart_internal_fn.markers = function() {
if(isNaN(point.x + point.y)) return ''; var d3 = this.d3;
function pt(point){
if(isNaN(point.x + point.y)){
return '';
}
return point.x+','+point.y; return point.x+','+point.y;
} }
function buildPath(points){ function buildPath(points){
var path = create('path'); var path = create('path');
var d = ''; var d = '';
for(var i = 0; i<points.length; i++){ for(var i = 0; i<points.length; i++){
...@@ -11,11 +16,8 @@ function buildPath(points){ ...@@ -11,11 +16,8 @@ function buildPath(points){
} }
path.attr('d', d); path.attr('d', d);
return path; return path;
} }
c3_chart_internal_fn.marker_fn = function() {
var $$ = this;
var d3 = $$.d3;
function create(name){ function create(name){
return d3.select(document.createElementNS("http://www.w3.org/2000/svg", name)); return d3.select(document.createElementNS("http://www.w3.org/2000/svg", name));
...@@ -112,7 +114,7 @@ c3_chart_internal_fn.marker_fn = function() { ...@@ -112,7 +114,7 @@ c3_chart_internal_fn.marker_fn = function() {
]).style('stroke', 'none'); ]).style('stroke', 'none');
} }
}; };
}; }
c3_chart_internal_fn.setMarker = function(id, type){ c3_chart_internal_fn.setMarker = function(id, type){
var $$ = this; var $$ = this;
...@@ -165,10 +167,10 @@ c3_chart_internal_fn.getMarker = function(d, i){ ...@@ -165,10 +167,10 @@ c3_chart_internal_fn.getMarker = function(d, i){
// If marker type isn't set at all, draw circle // If marker type isn't set at all, draw circle
if($$.config.marker_types[d.id] === undefined){ if($$.config.marker_types[d.id] === undefined){
return $$.marker_fn().circle($$.pointR(d, i)).node(); return $$.markers().circle($$.pointR(d, i)).node();
} }
var func = $$.marker_fn().[$$.config.marker_types[d.id]]; var func = $$.markers()[$$.config.marker_types[d.id]];
return func($$.pointR(d, i), $$.color(d, i)).node(); 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