diff options
Diffstat (limited to 'www/lib/tc-angular-chartjs')
| -rw-r--r-- | www/lib/tc-angular-chartjs/.bower.json | 10 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/README.md | 2 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/bower.json | 2 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.js | 10 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js | 6 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/index.js | 2 |
6 files changed, 21 insertions, 11 deletions
diff --git a/www/lib/tc-angular-chartjs/.bower.json b/www/lib/tc-angular-chartjs/.bower.json index ad34751c..693d2908 100644 --- a/www/lib/tc-angular-chartjs/.bower.json +++ b/www/lib/tc-angular-chartjs/.bower.json @@ -1,6 +1,6 @@ { "name": "tc-angular-chartjs", - "version": "1.0.9", + "version": "1.0.11", "description": "Add Chart.js charts to your angular application", "homepage": "http://carlcraig.github.io/tc-angular-chartjs/", "author": "Carl Craig <carlcraig@3c-studios.com>", @@ -36,14 +36,14 @@ "type": "git", "url": "https://github.com/carlcraig/tc-angular-chartjs.git" }, - "_release": "1.0.9", + "_release": "1.0.11", "_resolution": { "type": "version", - "tag": "v1.0.9", - "commit": "15269c4370dda4d9570daa10cdaebca7226fb71c" + "tag": "v1.0.11", + "commit": "b4445bbddf402df9dde7380b1e77e557bd0fbc86" }, "_source": "git://github.com/carlcraig/tc-angular-chartjs.git", - "_target": "~1.0.9", + "_target": "~1.0.11", "_originalSource": "tc-angular-chartjs", "_direct": true } diff --git a/www/lib/tc-angular-chartjs/README.md b/www/lib/tc-angular-chartjs/README.md index 3910579c..30722baa 100644 --- a/www/lib/tc-angular-chartjs/README.md +++ b/www/lib/tc-angular-chartjs/README.md @@ -31,6 +31,8 @@ Load `Chart.js` and `tc-angular-chartjs` as you would with normal scripts. <script type="text/javascript" src="js/tc-angular-chartjs.js"></script> ``` +Make sure you use `dist/tc-angular-chartjs.js` or `dist/tc-angular-chartjs.min.js` + Require `tc.chartjs` in your application modules where you require `Chart.js`. ```javascript diff --git a/www/lib/tc-angular-chartjs/bower.json b/www/lib/tc-angular-chartjs/bower.json index b1271f1f..01cb9981 100644 --- a/www/lib/tc-angular-chartjs/bower.json +++ b/www/lib/tc-angular-chartjs/bower.json @@ -1,6 +1,6 @@ { "name": "tc-angular-chartjs", - "version": "1.0.9", + "version": "1.0.11", "description": "Add Chart.js charts to your angular application", "homepage": "http://carlcraig.github.io/tc-angular-chartjs/", "author": "Carl Craig <carlcraig@3c-studios.com>", diff --git a/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.js b/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.js index 16c490c1..0faf909a 100644 --- a/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.js +++ b/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.js @@ -1,6 +1,6 @@ /** - * tc-angular-chartjs - v1.0.9 - 2014-10-14 - * Copyright (c) 2014 Carl Craig <carlcraig@3c-studios.com> + * tc-angular-chartjs - v1.0.11 - 2015-05-17 + * Copyright (c) 2015 Carl Craig <carlcraig@3c-studios.com> * Dual licensed with the Apache-2.0 or MIT license. */ (function() { @@ -65,6 +65,11 @@ autoLegend = true; } } + $scope.$on("$destroy", function() { + if (chartObj) { + chartObj.destroy(); + } + }); $scope.$watch("data", function(value) { if (value) { if (chartObj) { @@ -90,6 +95,7 @@ if (exposeChart) { $scope.chart = chartObj; } + chartObj.resize(); } }, true); } diff --git a/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js b/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js index b132aeef..5430e57c 100644 --- a/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js +++ b/www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js @@ -1,6 +1,6 @@ /** - * tc-angular-chartjs - v1.0.9 - 2014-10-14 - * Copyright (c) 2014 Carl Craig <carlcraig@3c-studios.com> + * tc-angular-chartjs - v1.0.11 - 2015-05-17 + * Copyright (c) 2015 Carl Craig <carlcraig@3c-studios.com> * Dual licensed with the Apache-2.0 or MIT license. */ -!function(){"use strict";function a(a){return new a}function b(a){return new a("line")}function c(a){return new a("bar")}function d(a){return new a("radar")}function e(a){return new a("polararea")}function f(a){return new a("pie")}function g(a){return new a("doughnut")}function h(){return function(a){function b(b,d,e){var f,g=d[0].getContext("2d"),h=new Chart(g),i=!1,j=!1,k=!1,l=null;for(var m in e)"chartLegend"===m?i=!0:"chart"===m?k=!0:"autoLegend"===m&&(j=!0);b.$watch("data",function(e){if(e){if(f&&f.destroy(),a)f=h[c(a)](b.data,b.options);else{if(!b.type)throw"Error creating chart: Chart type required.";f=h[c(b.type)](b.data,b.options)}i&&(b.legend=f.generateLegend()),j&&(l&&l.remove(),angular.element(d[0]).after(f.generateLegend()),l=angular.element(d[0]).next()),k&&(b.chart=f)}},!0)}function c(a){var b=a.toLowerCase();switch(b){case"line":return"Line";case"bar":return"Bar";case"radar":return"Radar";case"polararea":return"PolarArea";case"pie":return"Pie";case"doughnut":return"Doughnut";default:return a}}var d={restrict:"A",scope:{data:"=chartData",options:"=chartOptions",type:"@chartType",legend:"=chartLegend",chart:"=chart"},link:b};return d}}function i(){function a(a,b){a.$watch("legend",function(a){a&&b.html(a)},!0)}var b={restrict:"A",scope:{legend:"=chartLegend"},link:a};return b}angular.module("tc.chartjs",[]).directive("tcChartjs",a).directive("tcChartjsLine",b).directive("tcChartjsBar",c).directive("tcChartjsRadar",d).directive("tcChartjsPolararea",e).directive("tcChartjsPie",f).directive("tcChartjsDoughnut",g).directive("tcChartjsLegend",i).factory("TcChartjsFactory",h),a.$inject=["TcChartjsFactory"],b.$inject=["TcChartjsFactory"],c.$inject=["TcChartjsFactory"],d.$inject=["TcChartjsFactory"],e.$inject=["TcChartjsFactory"],f.$inject=["TcChartjsFactory"],g.$inject=["TcChartjsFactory"]}(); +!function(){"use strict";function a(a){return new a}function b(a){return new a("line")}function c(a){return new a("bar")}function d(a){return new a("radar")}function e(a){return new a("polararea")}function f(a){return new a("pie")}function g(a){return new a("doughnut")}function h(){return function(a){function b(b,d,e){var f,g=d[0].getContext("2d"),h=new Chart(g),i=!1,j=!1,k=!1,l=null;for(var m in e)"chartLegend"===m?i=!0:"chart"===m?k=!0:"autoLegend"===m&&(j=!0);b.$on("$destroy",function(){f&&f.destroy()}),b.$watch("data",function(e){if(e){if(f&&f.destroy(),a)f=h[c(a)](b.data,b.options);else{if(!b.type)throw"Error creating chart: Chart type required.";f=h[c(b.type)](b.data,b.options)}i&&(b.legend=f.generateLegend()),j&&(l&&l.remove(),angular.element(d[0]).after(f.generateLegend()),l=angular.element(d[0]).next()),k&&(b.chart=f),f.resize()}},!0)}function c(a){var b=a.toLowerCase();switch(b){case"line":return"Line";case"bar":return"Bar";case"radar":return"Radar";case"polararea":return"PolarArea";case"pie":return"Pie";case"doughnut":return"Doughnut";default:return a}}var d={restrict:"A",scope:{data:"=chartData",options:"=chartOptions",type:"@chartType",legend:"=chartLegend",chart:"=chart"},link:b};return d}}function i(){function a(a,b){a.$watch("legend",function(a){a&&b.html(a)},!0)}var b={restrict:"A",scope:{legend:"=chartLegend"},link:a};return b}angular.module("tc.chartjs",[]).directive("tcChartjs",a).directive("tcChartjsLine",b).directive("tcChartjsBar",c).directive("tcChartjsRadar",d).directive("tcChartjsPolararea",e).directive("tcChartjsPie",f).directive("tcChartjsDoughnut",g).directive("tcChartjsLegend",i).factory("TcChartjsFactory",h),a.$inject=["TcChartjsFactory"],b.$inject=["TcChartjsFactory"],c.$inject=["TcChartjsFactory"],d.$inject=["TcChartjsFactory"],e.$inject=["TcChartjsFactory"],f.$inject=["TcChartjsFactory"],g.$inject=["TcChartjsFactory"]}(); diff --git a/www/lib/tc-angular-chartjs/index.js b/www/lib/tc-angular-chartjs/index.js new file mode 100644 index 00000000..e124f0b6 --- /dev/null +++ b/www/lib/tc-angular-chartjs/index.js @@ -0,0 +1,2 @@ +require('./dist/tc-angular-chartjs.js'); +module.exports = 'tc.chartjs'; |
