From: zachpanz88 <zachary@panzarino.com>
Date: Sat, 4 Jun 2016 18:16:35 +0000 (-0400)
Subject: Update this -> me with master
X-Git-Tag: v2.1.5~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2695%2Fhead;p=thirdparty%2FChart.js.git

Update this -> me with master
---

148c66fe957e1211d65f975b72945a66118a514e
diff --cc src/core/core.controller.js
index c7861c236,657d84d15..db521c607
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@@ -83,7 -82,7 +83,7 @@@ module.exports = function(Chart) 
  			var newWidth = helpers.getMaximumWidth(canvas);
  			var aspectRatio = chart.aspectRatio;
  			var newHeight = (me.options.maintainAspectRatio && isNaN(aspectRatio) === false && isFinite(aspectRatio) && aspectRatio !== 0) ? newWidth / aspectRatio : helpers.getMaximumHeight(canvas);
--
++			
  			var sizeChanged = chart.width !== newWidth || chart.height !== newHeight;
  
  			if (!sizeChanged) {