recursive-merge
Advanced tools
Comparing version 1.1.1 to 1.1.2
@@ -19,3 +19,3 @@ // Generated by CoffeeScript 1.6.3 | ||
valueType = type.call(value); | ||
if (valueType === '[object Array]' || valueType === '[object Object]') { | ||
if ((valueType === '[object Array]' || valueType === '[object Object]') && value !== null) { | ||
left[i] = merge(left[i], value); | ||
@@ -31,3 +31,3 @@ } else { | ||
valueType = type.call(value); | ||
if (typeof left[name] === 'undefined') { | ||
if (typeof left[name] === 'undefined' || left[name] === null) { | ||
left[name] = value; | ||
@@ -34,0 +34,0 @@ } else if (valueType === '[object Array]' || valueType === '[object Object]') { |
{ | ||
"name": "recursive-merge", | ||
"description": "Recursive merge tool for arrays and objects", | ||
"version": "1.1.1", | ||
"version": "1.1.2", | ||
"author": { | ||
@@ -6,0 +6,0 @@ "name": "David Kudera", |
@@ -43,2 +43,5 @@ # Recursive merge | ||
* 1.1.2 | ||
+ Bug with null items in IE8 | ||
* 1.1.0 - 1.1.1 | ||
@@ -45,0 +48,0 @@ + Rewritten tests |
@@ -190,3 +190,3 @@ /** Generated by SimQ **/ | ||
valueType = type.call(value); | ||
if (valueType === '[object Array]' || valueType === '[object Object]') { | ||
if ((valueType === '[object Array]' || valueType === '[object Object]') && value !== null) { | ||
left[i] = merge(left[i], value); | ||
@@ -202,3 +202,3 @@ } else { | ||
valueType = type.call(value); | ||
if (typeof left[name] === 'undefined') { | ||
if (typeof left[name] === 'undefined' || left[name] === null) { | ||
left[name] = value; | ||
@@ -383,3 +383,3 @@ } else if (valueType === '[object Array]' || valueType === '[object Object]') { | ||
"description": "Recursive merge tool for arrays and objects", | ||
"version": "1.1.0", | ||
"version": "1.1.1", | ||
"author": { | ||
@@ -411,3 +411,3 @@ "name": "David Kudera", | ||
"scripts": { | ||
"test": "cd ./test; echo \"Testing in node:\"; mocha ./node/index.js --reporter spec; cd ./browser; simq build; echo \"Testing in browser:\"; mocha-phantomjs ./index.html;" | ||
"test": "cd ./test; echo \"Testing in node:\"; mocha ./node/index.js --reporter spec; cd ./browser; echo \"Testing in browser:\"; simq build; mocha-phantomjs ./index.html;" | ||
} | ||
@@ -420,4 +420,4 @@ } | ||
}); | ||
require.version = '5.1.1'; | ||
delete require.__setStats; | ||
require.__setStats({"/lib/Merge.js":{"atime":1385387764000,"mtime":1385387762000,"ctime":1385387762000},"/test/browser/tests/Merge.coffee":{"atime":1385387157000,"mtime":1385387105000,"ctime":1385387105000},"/package.json":{"atime":1385387640000,"mtime":1385387634000,"ctime":1385387634000}}); | ||
require.version = '5.1.2'; | ||
@@ -424,0 +424,0 @@ /** run section **/ |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
24969
589
53
0
2