Browse Source

Fix conflict for merge

pull/232/merge
Masayuki Tanaka 11 years ago
parent
commit
27f7fa0fde
  1. 8
      c3.js
  2. 6
      c3.min.js

8
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) {

6
c3.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save