From: Tommy Graves <tommy@infinitry.net>
Date: Tue, 5 Apr 2016 12:28:46 +0000 (-0400)
Subject: Fixed a bug with calculating the canvas width and height
X-Git-Tag: v1.1.1~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2220%2Fhead;p=thirdparty%2FChart.js.git

Fixed a bug with calculating the canvas width and height

A previous commit removing a workaround for an old Firefox bug left part
of that workaround in, and it was preventing the expected behavior of
the canvas size being equal to the offsetWidth and offsetHeight of the
canvas prior to instantiation of Chart.JS
---

diff --git a/src/Chart.Core.js b/src/Chart.Core.js
index 61a0646c4..4dc62867f 100755
--- a/src/Chart.Core.js
+++ b/src/Chart.Core.js
@@ -40,8 +40,6 @@
 		var width = this.width = computeDimension(context.canvas,'Width') || context.canvas.width;
 		var height = this.height = computeDimension(context.canvas,'Height') || context.canvas.height;
 
-		width = this.width = context.canvas.width;
-		height = this.height = context.canvas.height;
 		this.aspectRatio = this.width / this.height;
 		//High pixel density displays - multiply the size of the canvas height/width by the device pixel ratio, then scale.
 		helpers.retinaScale(this);