Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-09 10:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure _.merge assigns typed arrays directly. [closes #1453]

Browse Source
This commit is contained in:
John-David Dalton
2015-09-09 22:10:08 -07:00
parent 86d06e0a4c
commit 4a4e54479a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lodash.js
View File

@@ -2584,7 +2584,7 @@
if (isArray(srcValue) || isTypedArray(srcValue)) { if (isArray(srcValue) || isTypedArray(srcValue)) {
newValue = isArray(oldValue) newValue = isArray(oldValue)
? oldValue ? oldValue
: ((isObject(oldValue) && isArrayLike(oldValue)) ? copyArray(oldValue) : []); : ((isObject(oldValue) && isArrayLike(oldValue)) ? copyArray(oldValue) : srcValue);
} }
else if (isPlainObject(srcValue) || isArguments(srcValue)) { else if (isPlainObject(srcValue) || isArguments(srcValue)) {
newValue = isArguments(oldValue) newValue = isArguments(oldValue)

2
test/test.js
View File

@@ -12237,7 +12237,7 @@
function Foo() {} function Foo() {}
var values = [new Foo, new Boolean, new Date, Foo, new Number, new String, new RegExp], var values = [new Foo, new Boolean, new Date, Foo, new Number, new String, new RegExp, new (Uint8Array || noop)],
expected = _.map(values, _.constant(true)); expected = _.map(values, _.constant(true));
var actual = _.map(values, function(value) { var actual = _.map(values, function(value) {