From: Evert Timberg Date: Sun, 24 Apr 2016 12:20:36 +0000 (-0400) Subject: Only update the size of boxes that are not full width X-Git-Tag: 2.1.0~46^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2343%2Fhead;p=thirdparty%2FChart.js.git Only update the size of boxes that are not full width --- diff --git a/src/core/core.layoutService.js b/src/core/core.layoutService.js index 0da922074..700ecfd53 100644 --- a/src/core/core.layoutService.js +++ b/src/core/core.layoutService.js @@ -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; diff --git a/src/core/core.legend.js b/src/core/core.legend.js index 4c0ea4876..c54e2ef14 100644 --- a/src/core/core.legend.js +++ b/src/core/core.legend.js @@ -99,7 +99,6 @@ module.exports = function(Chart) { this.afterUpdate(); return this.minSize; - }, afterUpdate: helpers.noop,