watch data and options

carlcraig · Sep 4, 2016 · 84e8e52 · 84e8e52
1 parent f752b58
commit 84e8e52
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
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) {