Merge pull request #4268 from jtvd78/check-for-typed-array-in-minextend

Check for typed array in minExtend
plotly · Oct 15, 2019 · b3c1e7a · b3c1e7a
2 parents 25fe1c9 + 7f3b2bb
commit b3c1e7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -666,6 +666,8 @@ lib.minExtend = function(obj1, obj2) {
             } else {
                 objOut[k] = v.slice(0, arrayLen);
             }
+        } else if(lib.isTypedArray(v)) {
+            objOut[k] = v.subarray(0, arrayLen);
         } else if(v && (typeof v === 'object')) objOut[k] = lib.minExtend(obj1[k], obj2[k]);
         else objOut[k] = v;
     }

diff --git a/test/jasmine/tests/scatter_test.js b/test/jasmine/tests/scatter_test.js
@@ -1121,7 +1121,7 @@ describe('end-to-end scatter tests', function() {
 
             var legendPts = d3.select('.legend').selectAll('.scatterpts');
             expect(legendPts.size()).toBe(1, '# legend items');
-            expect(getColor(legendPts.node())).toBe('rgb(0, 0, 0)', 'legend pt color');
+            expect(getColor(legendPts.node())).toBe('rgb(0, 255, 0)', 'legend pt color');
             expect(getMarkerSize(legendPts.node())).toBe(16, 'legend pt size');
         })
         .catch(failTest)