make charts dependent on calculated width

diff --git a/Chart.js b/Chart.js
index e34e08a486effeea4d478616d24f9c26530d86b8..fb8fb0c5416696b8b00fd0582abd3a53e05982f2 100644 (file)
--- a/Chart.js
+++ b/Chart.js
@@ -25,8 +25,20 @@
                this.ctx = context;
 
                //Variables global to the chart
-               var width = this.width = context.canvas.width;
-               var height = this.height = context.canvas.height;
+               var computeDimension = function(element,dimension)
+               {
+                       if (element['offset'+dimension])
+                       {
+                               return element['offset'+dimension];
+                       }
+                       else
+                       {
+                               return document.defaultView.getComputedStyle(element).getPropertyValue(dimension);
+                       }
+               }
+
+               var width = this.width = computeDimension(context.canvas,'Width');
+               var height = this.height = computeDimension(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);