Skip to content

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

Fix tick bug

parent 2647aeaf
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 12 deletions
c3.js
View file @ 212e3c12
...@@ -8417,8 +8417,7 @@ ...@@ -8417,8 +8417,7 @@
} }
function tickSize(d) { function tickSize(d) {
var tickPosition = scale(d) + (tickCentered ? 0 : tickOffset); return innerTickSize;
return range[0] < tickPosition && tickPosition < range[1] ? innerTickSize : 0;
} }
text = tick.select("text"); text = tick.select("text");
...@@ -8503,7 +8502,9 @@ ...@@ -8503,7 +8502,9 @@
case "bottom": case "bottom":
{ {
tickTransform = axisX; tickTransform = axisX;
lineEnter.attr("y2", innerTickSize); lineEnter.attr("y2", function(d, i){
return innerTickSize;
});
textEnter.attr("y", tickLength); textEnter.attr("y", tickLength);
lineUpdate.attr("x1", tickX).attr("x2", tickX).attr("y2", tickSize); lineUpdate.attr("x1", tickX).attr("x2", tickX).attr("y2", tickSize);
textUpdate.attr("x", 0).attr("y", tickLength); textUpdate.attr("x", 0).attr("y", tickLength);
...@@ -8515,7 +8516,9 @@ ...@@ -8515,7 +8516,9 @@
case "top": case "top":
{ {
tickTransform = axisX; tickTransform = axisX;
lineEnter.attr("y2", -innerTickSize); lineEnter.attr("y2", function(d, i){
return -innerTickSize;
});
textEnter.attr("y", -tickLength); textEnter.attr("y", -tickLength);
lineUpdate.attr("x2", 0).attr("y2", -innerTickSize); lineUpdate.attr("x2", 0).attr("y2", -innerTickSize);
textUpdate.attr("x", 0).attr("y", -tickLength); textUpdate.attr("x", 0).attr("y", -tickLength);
...@@ -8529,7 +8532,9 @@ ...@@ -8529,7 +8532,9 @@
tickTransform = axisY; tickTransform = axisY;
lineEnter.attr("x2", -innerTickSize); lineEnter.attr("x2", -innerTickSize);
textEnter.attr("x", -tickLength); textEnter.attr("x", -tickLength);
lineUpdate.attr("x2", -innerTickSize).attr("y1", tickY).attr("y2", tickY); lineUpdate.attr("x2", -innerTickSize).attr("y1", tickY).attr("y2", function(d, i){
return tickY;
});
textUpdate.attr("x", -tickLength).attr("y", tickOffset); textUpdate.attr("x", -tickLength).attr("y", tickOffset);
text.style("text-anchor", "end"); text.style("text-anchor", "end");
tspan.attr('x', -tickLength).attr("dy", tspanDy); tspan.attr('x', -tickLength).attr("dy", tspanDy);
...@@ -8541,7 +8546,9 @@ ...@@ -8541,7 +8546,9 @@
tickTransform = axisY; tickTransform = axisY;
lineEnter.attr("x2", innerTickSize); lineEnter.attr("x2", innerTickSize);
textEnter.attr("x", tickLength); textEnter.attr("x", tickLength);
lineUpdate.attr("x2", innerTickSize).attr("y2", 0); lineUpdate.attr("x2", innerTickSize).attr("y2", function(d, i){
return 0;
});
textUpdate.attr("x", tickLength).attr("y", 0); textUpdate.attr("x", tickLength).attr("y", 0);
text.style("text-anchor", "start"); text.style("text-anchor", "start");
tspan.attr('x', tickLength).attr("dy", tspanDy); tspan.attr('x', tickLength).attr("dy", tspanDy);
...@@ -8549,6 +8556,7 @@ ...@@ -8549,6 +8556,7 @@
break; break;
} }
} }
if (scale1.rangeBand) { if (scale1.rangeBand) {
var x = scale1, dx = x.rangeBand() / 2; var x = scale1, dx = x.rangeBand() / 2;
scale0 = scale1 = function (d) { scale0 = scale1 = function (d) {
......
c3.min.js
View file @ 212e3c12
This source diff could not be displayed because it is too large. You can view the blob instead.
src/c3.axis.js
View file @ 212e3c12
...@@ -232,8 +232,7 @@ function c3_axis(d3, params, $$) { ...@@ -232,8 +232,7 @@ function c3_axis(d3, params, $$) {
} }
function tickSize(d) { function tickSize(d) {
var tickPosition = scale(d) + (tickCentered ? 0 : tickOffset); return innerTickSize;
return range[0] < tickPosition && tickPosition < range[1] ? innerTickSize : 0;
} }
text = tick.select("text"); text = tick.select("text");
...@@ -318,7 +317,9 @@ function c3_axis(d3, params, $$) { ...@@ -318,7 +317,9 @@ function c3_axis(d3, params, $$) {
case "bottom": case "bottom":
{ {
tickTransform = axisX; tickTransform = axisX;
lineEnter.attr("y2", innerTickSize); lineEnter.attr("y2", function(d, i){
return innerTickSize;
});
textEnter.attr("y", tickLength); textEnter.attr("y", tickLength);
lineUpdate.attr("x1", tickX).attr("x2", tickX).attr("y2", tickSize); lineUpdate.attr("x1", tickX).attr("x2", tickX).attr("y2", tickSize);
textUpdate.attr("x", 0).attr("y", tickLength); textUpdate.attr("x", 0).attr("y", tickLength);
...@@ -330,7 +331,9 @@ function c3_axis(d3, params, $$) { ...@@ -330,7 +331,9 @@ function c3_axis(d3, params, $$) {
case "top": case "top":
{ {
tickTransform = axisX; tickTransform = axisX;
lineEnter.attr("y2", -innerTickSize); lineEnter.attr("y2", function(d, i){
return -innerTickSize;
});
textEnter.attr("y", -tickLength); textEnter.attr("y", -tickLength);
lineUpdate.attr("x2", 0).attr("y2", -innerTickSize); lineUpdate.attr("x2", 0).attr("y2", -innerTickSize);
textUpdate.attr("x", 0).attr("y", -tickLength); textUpdate.attr("x", 0).attr("y", -tickLength);
...@@ -344,7 +347,9 @@ function c3_axis(d3, params, $$) { ...@@ -344,7 +347,9 @@ function c3_axis(d3, params, $$) {
tickTransform = axisY; tickTransform = axisY;
lineEnter.attr("x2", -innerTickSize); lineEnter.attr("x2", -innerTickSize);
textEnter.attr("x", -tickLength); textEnter.attr("x", -tickLength);
lineUpdate.attr("x2", -innerTickSize).attr("y1", tickY).attr("y2", tickY); lineUpdate.attr("x2", -innerTickSize).attr("y1", tickY).attr("y2", function(d, i){
return tickY;
});
textUpdate.attr("x", -tickLength).attr("y", tickOffset); textUpdate.attr("x", -tickLength).attr("y", tickOffset);
text.style("text-anchor", "end"); text.style("text-anchor", "end");
tspan.attr('x', -tickLength).attr("dy", tspanDy); tspan.attr('x', -tickLength).attr("dy", tspanDy);
...@@ -356,7 +361,9 @@ function c3_axis(d3, params, $$) { ...@@ -356,7 +361,9 @@ function c3_axis(d3, params, $$) {
tickTransform = axisY; tickTransform = axisY;
lineEnter.attr("x2", innerTickSize); lineEnter.attr("x2", innerTickSize);
textEnter.attr("x", tickLength); textEnter.attr("x", tickLength);
lineUpdate.attr("x2", innerTickSize).attr("y2", 0); lineUpdate.attr("x2", innerTickSize).attr("y2", function(d, i){
return 0;
});
textUpdate.attr("x", tickLength).attr("y", 0); textUpdate.attr("x", tickLength).attr("y", 0);
text.style("text-anchor", "start"); text.style("text-anchor", "start");
tspan.attr('x', tickLength).attr("dy", tspanDy); tspan.attr('x', tickLength).attr("dy", tspanDy);
...@@ -364,6 +371,7 @@ function c3_axis(d3, params, $$) { ...@@ -364,6 +371,7 @@ function c3_axis(d3, params, $$) {
break; break;
} }
} }
if (scale1.rangeBand) { if (scale1.rangeBand) {
var x = scale1, dx = x.rangeBand() / 2; var x = scale1, dx = x.rangeBand() / 2;
scale0 = scale1 = function (d) { scale0 = scale1 = function (d) {
......
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