Fix: $waterfall service, 修复瀑布流判定输入为undefined抛出异常。

huang-xiao-jian · May 17, 2016 · e7754cd · e7754cd
1 parent 68b9aca
commit e7754cd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/dist/echarts-ng.js b/dist/echarts-ng.js
@@ -91,7 +91,7 @@
        * @description - adapt tooltip when active waterfall transfer
        */
       function shouldAdaptWaterfall(config) {
-        if (!angular.isArray(config.series) || config.series.length !== 1) return false;
+        if (!angular.isObject(config) || !angular.isArray(config.series) || config.series.length !== 1) return false;
 
         var target = config.series[0];
 

diff --git a/dist/echarts-ng.min.js b/dist/echarts-ng.min.js
diff --git a/example/src/echarts-ng-waterfall.service.js b/example/src/echarts-ng-waterfall.service.js
@@ -40,7 +40,7 @@
        * @description - adapt tooltip when active waterfall transfer
        */
       function shouldAdaptWaterfall(config) {
-        if (!angular.isArray(config.series) || config.series.length !== 1) return false;
+        if (!angular.isObject(config) || !angular.isArray(config.series) || config.series.length !== 1) return false;
 
         var target = config.series[0];
 

diff --git a/src/echarts-ng-waterfall.service.js b/src/echarts-ng-waterfall.service.js
@@ -40,7 +40,7 @@
        * @description - adapt tooltip when active waterfall transfer
        */
       function shouldAdaptWaterfall(config) {
-        if (!angular.isArray(config.series) || config.series.length !== 1) return false;
+        if (!angular.isObject(config) || !angular.isArray(config.series) || config.series.length !== 1) return false;
 
         var target = config.series[0];
 

diff --git a/test/service/waterfall.spec.js b/test/service/waterfall.spec.js
@@ -8,6 +8,7 @@ describe('echarts-ng waterfall service', function () {
   }));
 
   it('should provide assay result whether waterfall adapt should active', function () {
+    expect($waterfall.shouldAdaptWaterfall()).toBeFalsy();
     expect($waterfall.shouldAdaptWaterfall({})).toBeFalsy();
     expect($waterfall.shouldAdaptWaterfall({series: [1, 2]})).toBeFalsy();
     expect($waterfall.shouldAdaptWaterfall({series: [{data: 'hello world!'}]})).toBeFalsy();