From 2e4bb1899f32db31b48291a7755d461ca0af0072 Mon Sep 17 00:00:00 2001 From: Nick Downie Date: Sat, 3 Jan 2015 15:40:33 +0000 Subject: [PATCH] Fix mixed whitespace --- src/Chart.Core.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Chart.Core.js b/src/Chart.Core.js index 03b99b45a..f1a3869c4 100755 --- a/src/Chart.Core.js +++ b/src/Chart.Core.js @@ -92,8 +92,8 @@ // Boolean - whether or not the chart should be responsive and resize when the browser does. responsive: false, - // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container - maintainAspectRatio: true, + // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container + maintainAspectRatio: true, // Boolean - Determines whether to draw tooltips on the canvas or not - attaches events to touchmove & mousemove showTooltips: true, @@ -441,7 +441,9 @@ //Templating methods //Javascript micro templating by John Resig - source at http://ejohn.org/blog/javascript-micro-templating/ template = helpers.template = function(templateString, valuesObject){ - // If templateString is function rather than string-template - call the function for valuesObject + + // If templateString is function rather than string-template - call the function for valuesObject + if(templateString instanceof Function){ return templateString(valuesObject); } @@ -830,7 +832,7 @@ newHeight = this.options.maintainAspectRatio ? newWidth / this.chart.aspectRatio : getMaximumHeight(this.chart.canvas); canvas.width = this.chart.width = newWidth; - canvas.height = this.chart.height = newHeight; + canvas.height = this.chart.height = newHeight; retinaScale(this.chart); -- 2.47.3