From: Evert Timberg Date: Wed, 6 Jan 2016 01:16:18 +0000 (-0500) Subject: Do not force resize if the size has not changed X-Git-Tag: v2.0.0~76^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1854%2Fhead;p=thirdparty%2FChart.js.git Do not force resize if the size has not changed --- diff --git a/src/core/core.controller.js b/src/core/core.controller.js index 17b875c5e..ea58c3ef7 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -63,6 +63,7 @@ this.updateLayout(); this.resetElements(); this.initToolTip(); + this.draw(); this.update(); // TODO @@ -83,17 +84,19 @@ }, resize: function resize(silent) { - this.stop(); var canvas = this.chart.canvas; var newWidth = helpers.getMaximumWidth(this.chart.canvas); var newHeight = (this.options.maintainAspectRatio && isNaN(this.chart.aspectRatio) === false && isFinite(this.chart.aspectRatio) && this.chart.aspectRatio !== 0) ? newWidth / this.chart.aspectRatio : helpers.getMaximumHeight(this.chart.canvas); + var sizeChanged = this.chart.width !== newWidth || this.chart.height !== newHeight; + canvas.width = this.chart.width = newWidth; canvas.height = this.chart.height = newHeight; helpers.retinaScale(this.chart); - if (!silent) { + if (!silent && sizeChanged) { + this.stop(); this.update(this.options.responsiveAnimationDuration); }