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 | 7 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/bower.json | 2 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.js | 31 | ||||
| -rw-r--r-- | www/lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js | 6 |
5 files changed, 39 insertions, 17 deletions
diff --git a/www/lib/tc-angular-chartjs/.bower.json b/www/lib/tc-angular-chartjs/.bower.json index 8d4eacad..4345f3cb 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.12", + "version": "1.0.15", "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,13 +36,13 @@ "type": "git", "url": "https://github.com/carlcraig/tc-angular-chartjs.git" }, - "_release": "1.0.12", + "_release": "1.0.15", "_resolution": { "type": "version", - "tag": "v1.0.12", - "commit": "b9a430c58bb1a2dcc6dc9afe16bc64b446b3ee2b" + "tag": "v1.0.15", + "commit": "37edd47299679b5d3a6a2b253342e7a567a16463" }, - "_source": "git://github.com/carlcraig/tc-angular-chartjs.git", + "_source": "https://github.com/carlcraig/tc-angular-chartjs.git", "_target": "~1.0.11", "_originalSource": "tc-angular-chartjs" }
\ No newline at end of file diff --git a/www/lib/tc-angular-chartjs/README.md b/www/lib/tc-angular-chartjs/README.md index 30722baa..74191e37 100644 --- a/www/lib/tc-angular-chartjs/README.md +++ b/www/lib/tc-angular-chartjs/README.md @@ -62,7 +62,7 @@ You will also want to give the chart some `data` and `options`. These can be pro by assigning $scope variables to `chart-options` and `chart-data` attributes on the same canvas element. ```html -<canvas tc-chartjs-doughnut chart-data="myData" chart-options="myOptions" width="350" height="350"></canvas> +<canvas tc-chartjs-doughnut chart-data="myData" chart-options="myOptions" chart-click="onChartClick(data, event)" width="350" height="350"></canvas> ``` ```javascript $scope.myData = [ @@ -75,6 +75,11 @@ $scope.myData = [ $scope.myOptions = { // Chart.js options can go here. }; + +$scope.onChartClick = function (data, event) { + console.log(data, event); +}; + ``` Using the `tc-chartjs` directive diff --git a/www/lib/tc-angular-chartjs/bower.json b/www/lib/tc-angular-chartjs/bower.json index bc66f4fb..ca3b7556 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.12", + "version": "1.0.15", "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 cd855372..3ff3025f 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.12 - 2015-07-08 - * Copyright (c) 2015 Carl Craig <carlcraig.threeceestudios@gmail.com> + * tc-angular-chartjs - v1.0.15 - 2016-02-15 + * Copyright (c) 2016 Carl Craig <carlcraig.threeceestudios@gmail.com> * Dual licensed with the Apache-2.0 or MIT license. */ (function() { @@ -42,8 +42,9 @@ data: "=chartData", options: "=chartOptions", type: "@chartType", - legend: "=chartLegend", - chart: "=chart" + legend: "=?chartLegend", + chart: "=?chart", + click: "&chartClick" }, link: link }; @@ -65,13 +66,29 @@ } } $scope.$on("$destroy", function() { - if (chartObj) { + if (chartObj && typeof chartObj.destroy === "function") { chartObj.destroy(); } }); + if ($scope.click) { + $elem[0].onclick = function(evt) { + var segment; + if (chartObj.getSegmentsAtEvent !== undefined) { + segment = chartObj.getSegmentsAtEvent(evt); + } else if (chartObj.getPointsAtEvent !== undefined) { + segment = chartObj.getPointsAtEvent(evt); + } else if (chartObj.getBarsAtEvent !== undefined) { + segment = chartObj.getBarsAtEvent(evt); + } + $scope.click({ + data: segment, + event: evt + }); + }; + } $scope.$watch("data", function(value) { if (value) { - if (chartObj) { + if (chartObj && typeof chartObj.destroy === "function") { chartObj.destroy(); } if (chartType) { @@ -129,7 +146,7 @@ return { restrict: "A", scope: { - legend: "=chartLegend" + legend: "=?chartLegend" }, link: link }; 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 e924acb2..3255d926 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.12 - 2015-07-08 - * Copyright (c) 2015 Carl Craig <carlcraig.threeceestudios@gmail.com> + * tc-angular-chartjs - v1.0.15 - 2016-02-15 + * Copyright (c) 2016 Carl Craig <carlcraig.threeceestudios@gmail.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.$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}}return{restrict:"A",scope:{data:"=chartData",options:"=chartOptions",type:"@chartType",legend:"=chartLegend",chart:"=chart"},link:b}}}function i(){function a(a,b){a.$watch("legend",function(a){a&&b.html(a)},!0)}return{restrict:"A",scope:{legend:"=chartLegend"},link:a}}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"]}();
\ No newline at end of file +!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&&"function"==typeof f.destroy&&f.destroy()}),b.click&&(d[0].onclick=function(a){var c;void 0!==f.getSegmentsAtEvent?c=f.getSegmentsAtEvent(a):void 0!==f.getPointsAtEvent?c=f.getPointsAtEvent(a):void 0!==f.getBarsAtEvent&&(c=f.getBarsAtEvent(a)),b.click({data:c,event:a})}),b.$watch("data",function(e){if(e){if(f&&"function"==typeof f.destroy&&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}}return{restrict:"A",scope:{data:"=chartData",options:"=chartOptions",type:"@chartType",legend:"=?chartLegend",chart:"=?chart",click:"&chartClick"},link:b}}}function i(){function a(a,b){a.$watch("legend",function(a){a&&b.html(a)},!0)}return{restrict:"A",scope:{legend:"=?chartLegend"},link:a}}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"]}();
\ No newline at end of file |