Commit fa669e81 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Accept 0 of padding option - #361

parent 8052bbef
...@@ -556,13 +556,13 @@ ...@@ -556,13 +556,13 @@
return h > 0 ? h : 320; return h > 0 ? h : 320;
} }
function getCurrentPaddingTop() { function getCurrentPaddingTop() {
return __padding_top ? __padding_top : 0; return isValue(__padding_top) ? __padding_top : 0;
} }
function getCurrentPaddingBottom() { function getCurrentPaddingBottom() {
return __padding_bottom ? __padding_bottom : 0; return isValue(__padding_bottom) ? __padding_bottom : 0;
} }
function getCurrentPaddingLeft() { function getCurrentPaddingLeft() {
if (__padding_left) { if (isValue(__padding_left)) {
return __padding_left; return __padding_left;
} else if (__axis_rotated) { } else if (__axis_rotated) {
return !__axis_x_show ? 1 : Math.max(ceil10(getAxisWidthByAxisId('x')), 40); return !__axis_x_show ? 1 : Math.max(ceil10(getAxisWidthByAxisId('x')), 40);
...@@ -572,8 +572,8 @@ ...@@ -572,8 +572,8 @@
} }
function getCurrentPaddingRight() { function getCurrentPaddingRight() {
var defaultPadding = 10, legendWidthOnRight = isLegendRight ? getLegendWidth() + 20 : 0; var defaultPadding = 10, legendWidthOnRight = isLegendRight ? getLegendWidth() + 20 : 0;
if (__padding_right) { if (isValue(__padding_right)) {
return __padding_right; return __padding_right + 1; // 1 is needed not to hide tick line
} else if (__axis_rotated) { } else if (__axis_rotated) {
return defaultPadding + legendWidthOnRight; return defaultPadding + legendWidthOnRight;
} else { } else {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -14,12 +14,13 @@ ...@@ -14,12 +14,13 @@
<div id="chart2"></div> <div id="chart2"></div>
<div id="chart3"></div> <div id="chart3"></div>
<div id="chart4"></div> <div id="chart4"></div>
<div id="chart5"></div>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script> <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="/js/c3.js"></script> <script src="/js/c3.js"></script>
<script> <script>
var chart = c3.generate({ var chart1 = c3.generate({
bindto: '#chart1', bindto: '#chart1',
padding: { padding: {
top: 50, top: 50,
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
} }
}); });
var chart = c3.generate({ var chart2 = c3.generate({
bindto: '#chart2', bindto: '#chart2',
padding: { padding: {
top: 50, top: 50,
...@@ -92,7 +93,7 @@ ...@@ -92,7 +93,7 @@
} }
}); });
var chart = c3.generate({ var chart3 = c3.generate({
bindto: '#chart3', bindto: '#chart3',
padding: { padding: {
top: 50, top: 50,
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
} }
}); });
var chart = c3.generate({ var chart4 = c3.generate({
bindto: '#chart4', bindto: '#chart4',
padding: { padding: {
top: 50, top: 50,
...@@ -171,6 +172,41 @@ ...@@ -171,6 +172,41 @@
} }
}); });
var chart5 = c3.generate({
bindto: '#chart5',
padding: {
top: 0,
right: 0,
bottom: 0,
left: 0,
},
data: {
columns: [
['data1', 30, 200, 100, 400, 150, 250],
['data2', 130, 100, 200, 100, 150, 150]
],
axes: {
data2: 'y2'
},
},
axis: {
rotated: true,
y: {
label: {
text: 'Y Label',
position: 'outer-center'
}
},
y2: {
show: true,
label: {
text: 'Y2 Label',
position: 'outer-center'
}
}
}
});
</script> </script>
</body> </body>
</html> </html>
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