playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix updateSize

pull/486/head
Masayuki Tanaka 11 years ago
parent
24e06dd40c
commit
ae7bc0c483
3 changed files with 63 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      c3.js
  2. 2
      c3.min.js
  3. 59
      src/core.js

59
c3.js
Unescape View File

@ -323,36 +323,39 @@
$$.currentWidth = $$.getCurrentWidth(); $$.currentWidth = $$.getCurrentWidth();
$$.currentHeight = $$.getCurrentHeight(); $$.currentHeight = $$.getCurrentHeight();
// for main, context // for main
if (config[__axis_rotated]) { $$.margin = config[__axis_rotated] ? {
$$.margin = { top: $$.getHorizontalAxisHeight('y2') + $$.getCurrentPaddingTop(),
top: $$.getHorizontalAxisHeight('y2') + $$.getCurrentPaddingTop(), right: hasArc ? 0 : $$.getCurrentPaddingRight(),
right: hasArc ? 0 : $$.getCurrentPaddingRight(), bottom: $$.getHorizontalAxisHeight('y') + legendHeightForBottom + $$.getCurrentPaddingBottom(),
bottom: $$.getHorizontalAxisHeight('y') + legendHeightForBottom + $$.getCurrentPaddingBottom(), left: subchartHeight + (hasArc ? 0 : $$.getCurrentPaddingLeft())
left: subchartHeight + (hasArc ? 0 : $$.getCurrentPaddingLeft()) } : {
}; top: 4 + $$.getCurrentPaddingTop(), // for top tick text
$$.margin2 = { right: hasArc ? 0 : $$.getCurrentPaddingRight(),
top: $$.margin.top, bottom: xAxisHeight + subchartHeight + legendHeightForBottom + $$.getCurrentPaddingBottom(),
right: NaN, left: hasArc ? 0 : $$.getCurrentPaddingLeft()
bottom: 20 + legendHeightForBottom, };
left: $$.rotated_padding_left
}; // for subchart
} else { $$.margin2 = config[__axis_rotated] ? {
$$.margin = { top: $$.margin.top,
top: 4 + $$.getCurrentPaddingTop(), // for top tick text right: NaN,
right: hasArc ? 0 : $$.getCurrentPaddingRight(), bottom: 20 + legendHeightForBottom,
bottom: xAxisHeight + subchartHeight + legendHeightForBottom + $$.getCurrentPaddingBottom(), left: $$.rotated_padding_left
left: hasArc ? 0 : $$.getCurrentPaddingLeft() } : {
}; top: $$.currentHeight - subchartHeight - legendHeightForBottom,
$$.margin2 = { right: NaN,
top: $$.currentHeight - subchartHeight - legendHeightForBottom, bottom: xAxisHeight + legendHeightForBottom,
right: NaN, left: $$.margin.left
bottom: xAxisHeight + legendHeightForBottom, };
left: $$.margin.left
};
}
// for legend // for legend
$$.margin3 = {
top: 0,
right: NaN,
bottom: 0,
left: 0
};
if ($$.updateSizeForLegend) { $$.updateSizeForLegend(legendHeight, legendWidth); } if ($$.updateSizeForLegend) { $$.updateSizeForLegend(legendHeight, legendWidth); }
$$.width = $$.currentWidth - $$.margin.left - $$.margin.right; $$.width = $$.currentWidth - $$.margin.left - $$.margin.right;

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

59
src/core.js
Unescape View File

@ -318,36 +318,39 @@ c3_chart_internal_fn.updateSizes = function () {
$$.currentWidth = $$.getCurrentWidth(); $$.currentWidth = $$.getCurrentWidth();
$$.currentHeight = $$.getCurrentHeight(); $$.currentHeight = $$.getCurrentHeight();
// for main, context // for main
if (config[__axis_rotated]) { $$.margin = config[__axis_rotated] ? {
$$.margin = { top: $$.getHorizontalAxisHeight('y2') + $$.getCurrentPaddingTop(),
top: $$.getHorizontalAxisHeight('y2') + $$.getCurrentPaddingTop(), right: hasArc ? 0 : $$.getCurrentPaddingRight(),
right: hasArc ? 0 : $$.getCurrentPaddingRight(), bottom: $$.getHorizontalAxisHeight('y') + legendHeightForBottom + $$.getCurrentPaddingBottom(),
bottom: $$.getHorizontalAxisHeight('y') + legendHeightForBottom + $$.getCurrentPaddingBottom(), left: subchartHeight + (hasArc ? 0 : $$.getCurrentPaddingLeft())
left: subchartHeight + (hasArc ? 0 : $$.getCurrentPaddingLeft()) } : {
}; top: 4 + $$.getCurrentPaddingTop(), // for top tick text
$$.margin2 = { right: hasArc ? 0 : $$.getCurrentPaddingRight(),
top: $$.margin.top, bottom: xAxisHeight + subchartHeight + legendHeightForBottom + $$.getCurrentPaddingBottom(),
right: NaN, left: hasArc ? 0 : $$.getCurrentPaddingLeft()
bottom: 20 + legendHeightForBottom, };
left: $$.rotated_padding_left
}; // for subchart
} else { $$.margin2 = config[__axis_rotated] ? {
$$.margin = { top: $$.margin.top,
top: 4 + $$.getCurrentPaddingTop(), // for top tick text right: NaN,
right: hasArc ? 0 : $$.getCurrentPaddingRight(), bottom: 20 + legendHeightForBottom,
bottom: xAxisHeight + subchartHeight + legendHeightForBottom + $$.getCurrentPaddingBottom(), left: $$.rotated_padding_left
left: hasArc ? 0 : $$.getCurrentPaddingLeft() } : {
}; top: $$.currentHeight - subchartHeight - legendHeightForBottom,
$$.margin2 = { right: NaN,
top: $$.currentHeight - subchartHeight - legendHeightForBottom, bottom: xAxisHeight + legendHeightForBottom,
right: NaN, left: $$.margin.left
bottom: xAxisHeight + legendHeightForBottom, };
left: $$.margin.left
};
}
// for legend // for legend
$$.margin3 = {
top: 0,
right: NaN,
bottom: 0,
left: 0
};
if ($$.updateSizeForLegend) { $$.updateSizeForLegend(legendHeight, legendWidth); } if ($$.updateSizeForLegend) { $$.updateSizeForLegend(legendHeight, legendWidth); }
$$.width = $$.currentWidth - $$.margin.left - $$.margin.right; $$.width = $$.currentWidth - $$.margin.left - $$.margin.right;

Write Preview
Loading…
Cancel
Save