watch data and options

carlcraig · carlcraig · commit 84e8e52b4e2b · 2016-09-04T03:19:55.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ bower_components/
 node_modules/
 !.gitkeep
 .DS_Store
+npm-debug.log
diff --git a/dist/tc-angular-chartjs.js b/dist/tc-angular-chartjs.js
@@ -119,8 +119,8 @@ function TcChartjsFactory() {
         };
       }
 
-      $scope.$watch('data', function ( value ) {
-        if (value) {
+      $scope.$watch('[data, options]', function (value) {
+        if (value && $scope.data) {
           if (chartObj && typeof chartObj.destroy === 'function') {
             chartObj.destroy();
           }
@@ -139,7 +139,6 @@ function TcChartjsFactory() {
           
           if (showLegend) {
             $scope.legend = chartObj.generateLegend();
-            console.log($scope.legend);
           }
 
           if (autoLegend) {
diff --git a/dist/tc-angular-chartjs.min.js b/dist/tc-angular-chartjs.min.js
diff --git a/src/tc-angular-chartjs.js b/src/tc-angular-chartjs.js
@@ -97,8 +97,8 @@ function TcChartjsFactory() {
         };
       }
 
-      $scope.$watch('data', function ( value ) {
-        if (value) {
+      $scope.$watch('[data, options]', function (value) {
+        if (value && $scope.data) {
           if (chartObj && typeof chartObj.destroy === 'function') {
             chartObj.destroy();
           }
@@ -117,7 +117,6 @@ function TcChartjsFactory() {
           
           if (showLegend) {
             $scope.legend = chartObj.generateLegend();
-            console.log($scope.legend);
           }
 
           if (autoLegend) {

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ function TcChartjsFactory() {`
`119`	`119`	`};`
`120`	`120`	`}`
`121`	`121`
`122`		`- $scope.$watch('data', function ( value ) {`
`123`		`- if (value) {`
	`122`	`+ $scope.$watch('[data, options]', function (value) {`
	`123`	`+ if (value && $scope.data) {`
`124`	`124`	`if (chartObj && typeof chartObj.destroy === 'function') {`
`125`	`125`	`chartObj.destroy();`
`126`	`126`	`}`
`@@ -139,7 +139,6 @@ function TcChartjsFactory() {`
`139`	`139`
`140`	`140`	`if (showLegend) {`
`141`	`141`	`$scope.legend = chartObj.generateLegend();`
`142`		`- console.log($scope.legend);`
`143`	`142`	`}`
`144`	`143`
`145`	`144`	`if (autoLegend) {`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ function TcChartjsFactory() {`
`97`	`97`	`};`
`98`	`98`	`}`
`99`	`99`
`100`		`- $scope.$watch('data', function ( value ) {`
`101`		`- if (value) {`
	`100`	`+ $scope.$watch('[data, options]', function (value) {`
	`101`	`+ if (value && $scope.data) {`
`102`	`102`	`if (chartObj && typeof chartObj.destroy === 'function') {`
`103`	`103`	`chartObj.destroy();`
`104`	`104`	`}`
`@@ -117,7 +117,6 @@ function TcChartjsFactory() {`
`117`	`117`
`118`	`118`	`if (showLegend) {`
`119`	`119`	`$scope.legend = chartObj.generateLegend();`
`120`		`- console.log($scope.legend);`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`if (autoLegend) {`