archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2343 from nnnick/fix/2152

Browse Source 
Only update the size of boxes that are not full width
This commit is contained in:
Evert Timberg 2016-04-24 09:40:34 -04:00
commit ae33b1ee54
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/core.layoutService.js
View File

@ -53,10 +53,6 @@ module.exports = function(Chart) {
return box.options.position === "chartArea";
});
function fullWidthSorter(a, b) {
}
// Ensure that full width boxes are at the very top / bottom
topBoxes.sort(function(a, b) {
return (b.options.fullWidth ? 1 : 0) - (a.options.fullWidth ? 1 : 0);
@ -253,11 +249,15 @@ module.exports = function(Chart) {
});
helpers.each(topBoxes, function(box) {
box.width = newMaxChartAreaWidth;
if (!box.options.fullWidth) {
box.width = newMaxChartAreaWidth;
}
});
helpers.each(bottomBoxes, function(box) {
box.width = newMaxChartAreaWidth;
if (!box.options.fullWidth) {
box.width = newMaxChartAreaWidth;
}
});
maxChartAreaHeight = newMaxChartAreaHeight;

1
src/core/core.legend.js
View File

@ -99,7 +99,6 @@ module.exports = function(Chart) {
this.afterUpdate();
return this.minSize;
},
afterUpdate: helpers.noop,