Skip to content

C
c3-closed
Commit 27f7fa0f authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix conflict for merge

parents fe6d127f 1e727864
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
c3.js
View file @ 27f7fa0f
...@@ -336,8 +336,8 @@ ...@@ -336,8 +336,8 @@
subXOrient = __axis_rotated ? "left" : "bottom"; subXOrient = __axis_rotated ? "left" : "bottom";
var translate = { var translate = {
main : function () { return "translate(" + margin.left + "," + margin.top + ")"; }, main : function () { return "translate(" + asHalfPixel(margin.left) + "," + asHalfPixel(margin.top) + ")"; },
context : function () { return "translate(" + margin2.left + "," + margin2.top + ")"; }, context : function () { return "translate(" + asHalfPixel(margin2.left) + "," + asHalfPixel(margin2.top) + ")"; },
legend : function () { return "translate(" + margin3.left + "," + margin3.top + ")"; }, legend : function () { return "translate(" + margin3.left + "," + margin3.top + ")"; },
x : function () { return "translate(0," + (__axis_rotated ? 0 : height) + ")"; }, x : function () { return "translate(0," + (__axis_rotated ? 0 : height) + ")"; },
y : function () { return "translate(0," + (__axis_rotated ? height : 0) + ")"; }, y : function () { return "translate(0," + (__axis_rotated ? height : 0) + ")"; },
...@@ -355,6 +355,10 @@ ...@@ -355,6 +355,10 @@
return "url(" + document.URL.split('#')[0] + "#" + id + ")"; return "url(" + document.URL.split('#')[0] + "#" + id + ")";
} }
function asHalfPixel(n) {
return Math.ceil(n) + 0.5;
}
function transformMain(withTransition, transitions) { function transformMain(withTransition, transitions) {
var xAxis, yAxis, y2Axis; var xAxis, yAxis, y2Axis;
if (transitions && transitions.axisX) { if (transitions && transitions.axisX) {
......
c3.min.js
View file @ 27f7fa0f
This source diff could not be displayed because it is too large. You can view the blob instead.
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