return as soon as finding a valid positive number

- apply isNumeric test
- should skip Infinity
- no need to compuet sum
- declare known size of Array

Author: archmoj

src/traces/pie/calc.js

@@ -30,7 +30,7 @@ function calc(gd, trace) {
     var i, pt;
 
     if(trace.dlabel) {
-        labels = [];
+        labels = new Array(len);
         for(i = 0; i < len; i++) {
             labels[i] = String(trace.label0 + i * trace.dlabel);
         }

src/traces/pie/defaults.js

@@ -8,6 +8,7 @@
 
 'use strict';
 
+var isNumeric = require('fast-isnumeric');
 var Lib = require('../../lib');
 var attributes = require('./attributes');
 var handleDomainDefaults = require('../../plots/domain').defaults;
@@ -24,16 +25,15 @@ function handleLabelsAndValues(labels, values) {
     if(!isFinite(len)) len = 0;
 
     if(len && hasValues) {
-        var sum = 0;
+        var hasPositive;
         for(var i = 0; i < len; i++) {
-            var v = +values[i];
-            if(v < 0) {
-                sum = 0;
+            var v = values[i];
+            if(isNumeric(v) && v > 0) {
+                hasPositive = true;
                 break;
             }
-            sum += v;
         }
-        if(!sum) len = 0;
+        if(!hasPositive) len = 0;
     }
 
     return {

test/jasmine/tests/funnelarea_test.js

@@ -71,10 +71,21 @@ describe('Funnelarea defaults', function() {
         expect(out.visible).toBe(false);
     });
 
-    it('allows falsy json values to skip but does not allow bad values and zero sum', function() {
-        var out;
+    it('skip negatives and non-JSON values and avoid zero total', function() {
+        [
+            -1, '-1',
+            0, '0',
+            false, 'false',
+            true, 'true',
+            null, 'null',
+            NaN, 'NaN',
+            -Infinity, '-Infinity',
+            Infinity, 'Infinity',
+            undefined, 'undefined',
+            '', [], {}
+        ].forEach(function(e) {
+            var out;
 
-        [null, 0, '', false].forEach(function(e) {
             out = _supply({type: 'pie', values: [1, e, 3]});
             expect(out.visible).toBe(true, e);
             expect(out._length).toBe(3, e);
@@ -91,18 +102,12 @@ describe('Funnelarea defaults', function() {
             expect(out.visible).toBe(false, e);
             expect(out._length).toBe(undefined, e);
         });
+    });
 
-        ['not a positive value', '-1', -1, NaN, undefined].forEach(function(e) {
-            out = _supply({type: 'pie', values: [0, e]});
-            expect(out.visible).toBe(false, e);
-            expect(out._length).toBe(undefined, e);
-
-            out = _supply({type: 'pie', values: [1, e]});
-            expect(out.visible).toBe(false, e);
-            expect(out._length).toBe(undefined, e);
-        });
-
+    it('convert positive numbers in string format', function() {
         ['1', '+1', '1e1'].forEach(function(e) {
+            var out;
+
             out = _supply({type: 'pie', values: [0, e]});
             expect(out.visible).toBe(true, e);
             expect(out._length).toBe(2, e);

test/jasmine/tests/pie_test.js

@@ -55,10 +55,21 @@ describe('Pie defaults', function() {
         expect(out.visible).toBe(false);
     });
 
-    it('allows falsy json values to skip but does not allow bad values and zero sum', function() {
-        var out;
+    it('skip negatives and non-JSON values and avoid zero total', function() {
+        [
+            -1, '-1',
+            0, '0',
+            false, 'false',
+            true, 'true',
+            null, 'null',
+            NaN, 'NaN',
+            -Infinity, '-Infinity',
+            Infinity, 'Infinity',
+            undefined, 'undefined',
+            '', [], {}
+        ].forEach(function(e) {
+            var out;
 
-        [null, 0, '', false].forEach(function(e) {
             out = _supply({type: 'pie', values: [1, e, 3]});
             expect(out.visible).toBe(true, e);
             expect(out._length).toBe(3, e);
@@ -75,18 +86,12 @@ describe('Pie defaults', function() {
             expect(out.visible).toBe(false, e);
             expect(out._length).toBe(undefined, e);
         });
+    });
 
-        ['not a positive value', '-1', -1, NaN, -Infinity, undefined].forEach(function(e) {
-            out = _supply({type: 'pie', values: [0, e]});
-            expect(out.visible).toBe(false, e);
-            expect(out._length).toBe(undefined, e);
-
-            out = _supply({type: 'pie', values: [1, e]});
-            expect(out.visible).toBe(false, e);
-            expect(out._length).toBe(undefined, e);
-        });
-
+    it('convert positive numbers in string format', function() {
         ['1', '+1', '1e1'].forEach(function(e) {
+            var out;
+
             out = _supply({type: 'pie', values: [0, e]});
             expect(out.visible).toBe(true, e);
             expect(out._length).toBe(2, e);