moved convert typedArray logic from defaults to calc step

Author: archmoj

src/traces/parcoords/calc.js

@@ -14,7 +14,13 @@ var Lib = require('../../lib');
 var wrap = require('../../lib/gup').wrap;
 
 module.exports = function calc(gd, trace) {
-    var cs = !!trace.line.colorscale && Lib.isArrayOrTypedArray(trace.line.color);
+
+    for(var i = 0; i < trace.dimensions.length; i++) {
+        trace.dimensions[i].values = convertTypedArray(trace.dimensions[i].values);
+    }
+    trace.line.color = convertTypedArray(trace.line.color);
+
+    var cs = !!trace.line.colorscale && Array.isArray(trace.line.color);
     var color = cs ? trace.line.color : constHalf(trace._length);
     var cscale = cs ? trace.line.colorscale : [[0, trace.line.color], [1, trace.line.color]];
 
@@ -39,3 +45,11 @@ function constHalf(len) {
     }
     return out;
 }
+
+function isTypedArray(a) {
+    return !Array.isArray(a) && Lib.isArrayOrTypedArray(a);
+}
+
+function convertTypedArray(a) {
+    return (isTypedArray(a)) ? Array.prototype.slice.call(a) : a;
+}

src/traces/parcoords/defaults.js

@@ -20,12 +20,7 @@ var maxDimensionCount = require('./constants').maxDimensionCount;
 var mergeLength = require('./merge_length');
 
 function handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
-
     var lineColor = coerce('line.color', defaultColor);
-    if(!Array.isArray(lineColor) && Lib.isArrayOrTypedArray(lineColor)) {
-        // should convert typed arrays e.g. integers to real numbers
-        lineColor = traceOut.line.color = Array.prototype.slice.call(lineColor);
-    }
 
     if(hasColorscale(traceIn, 'line') && Lib.isArrayOrTypedArray(lineColor)) {
         if(lineColor.length) {
@@ -49,11 +44,6 @@ function dimensionDefaults(dimensionIn, dimensionOut) {
     }
 
     var values = coerce('values');
-    if(!Array.isArray(values) && Lib.isArrayOrTypedArray(values)) {
-        // should convert typed arrays e.g. integers to real numbers
-        values = dimensionOut.values = Array.prototype.slice.call(values);
-    }
-
     var visible = coerce('visible');
     if(!(values && values.length)) {
         visible = dimensionOut.visible = false;

test/jasmine/tests/parcoords_test.js

@@ -145,30 +145,6 @@ describe('parcoords initialization tests', function() {
             });
         });
 
-        it('\'dimensions.values\' and \'line.color\' should convert typed arrays to normal arrays', function() {
-            var fullTrace = _supply({
-                dimensions: [{
-                    range: [1, 5],
-                    label: 'A',
-                    values: [1, 4, 3]
-                }, {
-                    range: [1, 5],
-                    label: 'B',
-                    values: new Float64Array([3, 1.5, 2]),
-                }, {
-                    range: [1, 5],
-                    label: 'C',
-                    values: new Int32Array([2, 4, 1]),
-                }],
-                line: {
-                    color: new Int32Array([0, 1, 2])
-                }
-            });
-            expect(Array.isArray(fullTrace.line.color) === true).toEqual(true);
-            expect(Array.isArray(fullTrace.dimensions[1].values) === true).toEqual(true);
-            expect(Array.isArray(fullTrace.dimensions[2].values) === true).toEqual(true);
-        });
-
         it('\'domain\' specification should have a default', function() {
             var fullTrace = _supply({});
             expect(fullTrace.domain).toEqual({x: [0, 1], y: [0, 1]});
@@ -350,6 +326,30 @@ describe('parcoords initialization tests', function() {
                 color: '#444'
             });
         });
+
+        it('\'dimensions.values\' and \'line.color\' should convert typed arrays to normal arrays', function() {
+            var fullTrace = _calc(Lib.extendDeep({}, base, {
+                dimensions: [{
+                    range: [1, 5],
+                    label: 'A',
+                    values: [1, 4, 3]
+                }, {
+                    range: [1, 5],
+                    label: 'B',
+                    values: new Float64Array([3, 1.5, 2]),
+                }, {
+                    range: [1, 5],
+                    label: 'C',
+                    values: new Int32Array([2, 4, 1]),
+                }],
+                line: {
+                    color: new Int32Array([0, 1, 2])
+                }
+            }));
+            expect(Array.isArray(fullTrace.line.color) === true).toEqual(true);
+            expect(Array.isArray(fullTrace.dimensions[1].values) === true).toEqual(true);
+            expect(Array.isArray(fullTrace.dimensions[2].values) === true).toEqual(true);
+        });
     });
 });