Fix conflict for merge

11 years ago · 27f7fa0fde
2 changed files with 9 additions and 5 deletions
--- a/c3.js
+++ b/c3.js
@ -336,8 +336,8 @@
            subXOrient = __axis_rotated ? "left" : "bottom";

        var translate = {
-            main : function () { return "translate(" + margin.left + "," + margin.top + ")"; },
-            context : function () { return "translate(" + margin2.left + "," + margin2.top + ")"; },
+            main : function () { return "translate(" + asHalfPixel(margin.left) + "," + asHalfPixel(margin.top) + ")"; },
+            context : function () { return "translate(" + asHalfPixel(margin2.left) + "," + asHalfPixel(margin2.top) + ")"; },
            legend : function () { return "translate(" + margin3.left + "," + margin3.top + ")"; },
            x : function () { return "translate(0," + (__axis_rotated ? 0 : height) + ")"; },
            y : function () { return "translate(0," + (__axis_rotated ? height : 0) + ")"; },
@ -355,6 +355,10 @@
            return "url(" + document.URL.split('#')[0] + "#" + id + ")";
        }

+        function asHalfPixel(n) {
+            return Math.ceil(n) + 0.5;
+        }
+
        function transformMain(withTransition, transitions) {
            var xAxis, yAxis, y2Axis;
            if (transitions && transitions.axisX) {
--- a/c3.min.js
+++ b/c3.min.js