kien.luu/always-create-chart-if-has-no-data

jtblin · Aug 4, 2021 · 892b982 · 892b982
1 parent 24be2ec
commit 892b982
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/angular-chart.js b/angular-chart.js
@@ -110,7 +110,8 @@
           chartClick: '=?',
           chartHover: '=?',
           chartDatasetOverride: '=?',
-          chartForceUpdate: '=?'
+          chartForceUpdate: '=?',
+          chartDisplayWhenNoData: '=?'
         },
         link: function (scope, elem/*, attrs */) {
           if (useExcanvas) window.G_vmlCanvasManager.initElement(elem[0]);
@@ -133,7 +134,7 @@
           });
 
           function watchData (newVal, oldVal) {
-            if (! newVal || ! newVal.length || (Array.isArray(newVal[0]) && ! newVal[0].length)) {
+            if (!scope.chartDisplayWhenNoData && (! newVal || ! newVal.length || (Array.isArray(newVal[0]) && ! newVal[0].length))) {
               destroyChart(scope);
               return;
             }
@@ -174,7 +175,7 @@
 
     function createChart (type, scope, elem) {
       var options = getChartOptions(type, scope);
-      if (! hasData(scope) || ! canDisplay(type, scope, elem, options)) return;
+      if (!scope.chartDisplayWhenNoData && (! hasData(scope) || ! canDisplay(type, scope, elem, options))) return;
 
       var cvs = elem[0];
       var ctx = cvs.getContext('2d');

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-chart.js",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": [
     "./dist/angular-chart.js"
   ],

diff --git a/dist/angular-chart.js b/dist/angular-chart.js
@@ -110,7 +110,8 @@
           chartClick: '=?',
           chartHover: '=?',
           chartDatasetOverride: '=?',
-          chartForceUpdate: '=?'
+          chartForceUpdate: '=?',
+          chartDisplayWhenNoData: '=?'
         },
         link: function (scope, elem/*, attrs */) {
           if (useExcanvas) window.G_vmlCanvasManager.initElement(elem[0]);
@@ -133,7 +134,7 @@
           });
 
           function watchData (newVal, oldVal) {
-            if (! newVal || ! newVal.length || (Array.isArray(newVal[0]) && ! newVal[0].length)) {
+            if (!scope.chartDisplayWhenNoData && (! newVal || ! newVal.length || (Array.isArray(newVal[0]) && ! newVal[0].length))) {
               destroyChart(scope);
               return;
             }
@@ -174,7 +175,7 @@
 
     function createChart (type, scope, elem) {
       var options = getChartOptions(type, scope);
-      if (! hasData(scope) || ! canDisplay(type, scope, elem, options)) return;
+      if (!scope.chartDisplayWhenNoData && (! hasData(scope) || ! canDisplay(type, scope, elem, options))) return;
 
       var cvs = elem[0];
       var ctx = cvs.getContext('2d');

diff --git a/dist/angular-chart.min.js b/dist/angular-chart.min.js