Thanks to visit codestin.com
Credit goes to github.com

Skip to content

preventing a merge of primitive values #11

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
justinbmeyer merged 1 commit into from
Aug 28, 2018
Merged

preventing a merge of primitive values #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions merge-deep/merge-deep-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,16 @@ QUnit.test("call new with one argument (#7)", function(){
smartMerge(list, [{foo: "bar"}]);
});


QUnit.test("can merge array of primitives (#10)", function(){
var listA = ["a","b","c"];
var listB = ["a","c"];

smartMerge(listA,listB);

QUnit.deepEqual(listA,["a","c"]);
});

/*
QUnit.test('smartMerge can-connect behavior', function(assert) {
var done = assert.async();
Expand Down
5 changes: 4 additions & 1 deletion merge-deep/merge-deep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ function mergeList(list, data) {
var eq = a === b;
if (eq) {
// If id is the same we merge data in. Case #2
mergeMap(a, b);
if(! canReflect.isPrimitive(a) ) {
mergeMap(a, b);
}

}
return eq;
}
Expand Down