Skip to content

C
c3-closed
Commit 0271a0c8 authored by michalkop93's avatar michalkop93
Browse files
Options

Merge pull request #1 from masayuki0812/master

merging upstream
parents 70728338 0b2d4ec9
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 7 deletions
bower.json
View file @ 0271a0c8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"c3.css", "c3.css",
"c3.js" "c3.js"
], ],
"version": "0.2.4", "version": "0.2.5",
"homepage": "https://github.com/masayuki0812/c3", "homepage": "https://github.com/masayuki0812/c3",
"authors": [ "authors": [
"Masayuki Tanaka <masayuki0812@mac.com>" "Masayuki Tanaka <masayuki0812@mac.com>"
......
c3.js
View file @ 0271a0c8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/*global define, module, exports, require */ /*global define, module, exports, require */
var c3 = { var c3 = {
version: "0.2.4" version: "0.2.5"
}; };
var CLASS = { var CLASS = {
...@@ -2063,7 +2063,7 @@ ...@@ -2063,7 +2063,7 @@
if (tooltipRight > chartRight) { if (tooltipRight > chartRight) {
tooltipLeft -= tooltipRight - chartRight; tooltipLeft -= tooltipRight - chartRight;
} }
if (tooltipTop + tHeight > getCurrentHeight()) { if (tooltipTop + tHeight > getCurrentHeight() && tooltipTop > tHeight + 30) {
tooltipTop -= tHeight + 30; tooltipTop -= tHeight + 30;
} }
} }
...@@ -5559,8 +5559,15 @@ ...@@ -5559,8 +5559,15 @@
return axis; return axis;
}; };
axis.tickValues = function (x) { axis.tickValues = function (x) {
if (!arguments.length) { return tickValues; } if (typeof x === 'function') {
tickValues = x; tickValues = function () {
return x(scale.domain());
};
}
else {
if (!arguments.length) { return tickValues; }
tickValues = x;
}
return axis; return axis;
}; };
return axis; return axis;
......
c3.min.js
View file @ 0271a0c8
This source diff could not be displayed because it is too large. You can view the blob instead.
component.json
View file @ 0271a0c8
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "c3", "name": "c3",
"repo": "masayuki0812/c3", "repo": "masayuki0812/c3",
"description": "A D3-based reusable chart library", "description": "A D3-based reusable chart library",
"version": "0.2.4", "version": "0.2.5",
"keywords": [], "keywords": [],
"dependencies": { "dependencies": {
"mbostock/d3": "*" "mbostock/d3": "*"
......
package.json
View file @ 0271a0c8
{ {
"name": "c3", "name": "c3",
"version": "0.2.4", "version": "0.2.5",
"description": "D3-based reusable chart library", "description": "D3-based reusable chart library",
"main": "c3.js", "main": "c3.js",
"scripts": { "scripts": {
......
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