Skip to content

Check for typed array in minExtend #4268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 15, 2019
Merged

Check for typed array in minExtend #4268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cb8f87
Check for typed array in minExtend
Oct 10, 2019
7f3b2bb
PR-4286:
Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
PR-4286: 
Updated broken test
Used subarray instead of slice for typed array to support older browsers
  • Loading branch information
Justin Van Dort committed Oct 11, 2019
commit 7f3b2bb75f5018ee584e8128149be0beada97bf2
4 changes: 3 additions & 1 deletion src/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,12 +660,14 @@ lib.minExtend = function(obj1, obj2) {
v = obj1[k];
if(k.charAt(0) === '_' || typeof v === 'function') continue;
else if(k === 'module') objOut[k] = v;
else if(lib.isArrayOrTypedArray(v)) {
else if(Array.isArray(v)) {
if(k === 'colorscale') {
objOut[k] = v.slice();
} 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;
}
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/scatter_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down