From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 27 Feb 2016 20:46:05 +0000 (-0500)
Subject: Merge pull request #1070 from mackuba/stop_animations
X-Git-Tag: v1.1.0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea0d93c9703faccbde85f7039c556210a6a45124;p=thirdparty%2FChart.js.git

Merge pull request #1070 from mackuba/stop_animations

Stop animations when destroying a chart
---

ea0d93c9703faccbde85f7039c556210a6a45124
diff --cc src/Chart.Core.js
index 979a91b7c,83bfdfb32..0c4059889
--- a/src/Chart.Core.js
+++ b/src/Chart.Core.js
@@@ -977,9 -949,10 +977,10 @@@
  			return this;
  		},
  		generateLegend : function(){
 -			return template(this.options.legendTemplate,this);
 +			return helpers.template(this.options.legendTemplate, {datasets: this.data.datasets});
  		},
  		destroy : function(){
+ 			this.stop();
  			this.clear();
  			unbindEvents(this, this.events);
  			var canvas = this.chart.canvas;