Commit 42b28495 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Merge branch 'master' of https://github.com/michalkop93/c3 into michalkop93-master

parents 799b6347 cc794c66
...@@ -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>"
......
...@@ -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 = {
...@@ -1250,6 +1250,12 @@ ...@@ -1250,6 +1250,12 @@
if (yTargets.length === 0) { // use current domain if target of axisId is none if (yTargets.length === 0) { // use current domain if target of axisId is none
return axisId === 'y2' ? y2.domain() : y.domain(); return axisId === 'y2' ? y2.domain() : y.domain();
} }
if (isNaN(yDomainMin)) { // set minimum to zero when not number
yDomainMin = 0;
}
if (isNaN(yDomainMax)) { // set maximum to have same value as yDomainMin
yDomainMax = yDomainMin;
}
if (yDomainMin === yDomainMax) { if (yDomainMin === yDomainMax) {
yDomainMin < 0 ? yDomainMax = 0 : yDomainMin = 0; yDomainMin < 0 ? yDomainMax = 0 : yDomainMin = 0;
} }
...@@ -2063,7 +2069,7 @@ ...@@ -2063,7 +2069,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;
} }
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -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": "*"
......
{ {
"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