Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 19 additions & 11 deletions merge.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
;(function(isNode) {

/**
* Merge one or more objects
* Merge one or more objects
* @param bool? clone
* @param mixed,... arguments
* @return object
Expand All @@ -23,7 +23,7 @@
}, publicName = 'merge';

/**
* Merge two or more objects recursively
* Merge two or more objects recursively
* @param bool? clone
* @param mixed,... arguments
* @return object
Expand Down Expand Up @@ -85,13 +85,17 @@

for (var key in extend) {

if (typeOf(base[key]) === 'object' && typeOf(extend[key]) === 'object') {
if (extend.hasOwnProperty(key)) {

base[key] = merge_recursive(base[key], extend[key]);
if (typeOf(base[key]) === 'object' && typeOf(extend[key]) === 'object') {

} else {
base[key] = merge_recursive(base[key], extend[key]);

base[key] = extend[key];
} else {

base[key] = extend[key];

}

}

Expand Down Expand Up @@ -128,15 +132,19 @@

for (var key in item) {

var sitem = clone ? Public.clone(item[key]) : item[key];
if (item.hasOwnProperty(key)) {

if (recursive) {
var sitem = clone ? Public.clone(item[key]) : item[key];

result[key] = merge_recursive(result[key], sitem);
if (recursive) {

} else {
result[key] = merge_recursive(result[key], sitem);

} else {

result[key] = sitem;

result[key] = sitem;
}

}

Expand Down
20 changes: 20 additions & 0 deletions tests/tests.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
function Foo(){}

Foo.prototype.bar = 1;

test('merge', function() {

deepEqual(
Expand Down Expand Up @@ -48,6 +52,14 @@ test('merge', function() {

);

deepEqual(

merge({}, new Foo()),

{}

);

});

test('merge (clone)', function() {
Expand Down Expand Up @@ -141,6 +153,14 @@ test('merge.recursive', function() {

);

deepEqual(

merge.recursive({}, new Foo()),

{}

);

});

test('merge.recursive (clone)', function() {
Expand Down