diff --git a/bower.json b/bower.json index 01cb998..bc66f4f 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "tc-angular-chartjs", - "version": "1.0.11", + "version": "1.0.12", "description": "Add Chart.js charts to your angular application", "homepage": "http://carlcraig.github.io/tc-angular-chartjs/", "author": "Carl Craig ", diff --git a/dist/tc-angular-chartjs.js b/dist/tc-angular-chartjs.js index 3674719..cd85537 100644 --- a/dist/tc-angular-chartjs.js +++ b/dist/tc-angular-chartjs.js @@ -1,6 +1,6 @@ /** - * tc-angular-chartjs - v1.0.11 - 2015-05-17 - * Copyright (c) 2015 Carl Craig + * tc-angular-chartjs - v1.0.12 - 2015-07-08 + * Copyright (c) 2015 Carl Craig * Dual licensed with the Apache-2.0 or MIT license. */ (function() { @@ -36,7 +36,7 @@ TcChartjsDoughnut.$inject = [ "TcChartjsFactory" ]; function TcChartjsFactory() { return function(chartType) { - var directive = { + return { restrict: "A", scope: { data: "=chartData", @@ -47,7 +47,6 @@ }, link: link }; - return directive; function link($scope, $elem, $attrs) { var ctx = $elem[0].getContext("2d"); var chart = new Chart(ctx); @@ -127,14 +126,13 @@ }; } function TcChartjsLegend() { - var directive = { + return { restrict: "A", scope: { legend: "=chartLegend" }, link: link }; - return directive; function link($scope, $elem) { $scope.$watch("legend", function(value) { if (value) { diff --git a/dist/tc-angular-chartjs.min.js b/dist/tc-angular-chartjs.min.js index 6ea39a1..e924acb 100644 --- a/dist/tc-angular-chartjs.min.js +++ b/dist/tc-angular-chartjs.min.js @@ -1,6 +1,6 @@ /** - * tc-angular-chartjs - v1.0.11 - 2015-05-17 - * Copyright (c) 2015 Carl Craig + * tc-angular-chartjs - v1.0.12 - 2015-07-08 + * Copyright (c) 2015 Carl Craig * 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}}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"]}(); \ 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&&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 diff --git a/package.json b/package.json index 9a08e12..6733d53 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "tc-angular-chartjs", - "version": "1.0.11", + "version": "1.0.12", "description": "Add Chart.js charts to your angular application", "homepage": "http://carlcraig.github.io/tc-angular-chartjs/", - "author": "Carl Craig ", + "author": "Carl Craig ", "main": "index.js", "dependencies": { "chart.js": "^1.0.2"