diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40d15c9a1..5812f0fdc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,6 +44,9 @@ Guidlines: - Please make your commits in logical sections with clear commit messages - Please avoid committing in the build Chart.js & Chart.min.js file, as it may cause conflicts when merging back +Joining the Project +------------- + - Active committers and contributors are invited to introduce yourself and request commit access to this project. Please send an email to hello@nickdownie.com or file an issue. License ------- diff --git a/Chart.js b/Chart.js index e34e08a48..3c217c87d 100644 --- a/Chart.js +++ b/Chart.js @@ -25,8 +25,25 @@ 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'); + + // Firefox requires this to work correctly + context.canvas.width = width; + context.canvas.height = 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); diff --git a/src/Chart.PolarArea.js b/src/Chart.PolarArea.js index 4dbf2eb92..8f2b9c52c 100644 --- a/src/Chart.PolarArea.js +++ b/src/Chart.PolarArea.js @@ -195,6 +195,8 @@ helpers.each(this.segments,function(segment){ segment.save(); }); + + this.reflow(); this.render(); }, reflow : function(){