Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 17715fa

Browse files
luckylookepetebacondarwin
authored andcommitted
fix(merge): clone elements instead of treating them like simple objects
Similar fix to #11720 Closes #12286
1 parent 96288d0 commit 17715fa

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

src/Angular.js

+2
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ function baseExtend(dst, objs, deep) {
360360
dst[key] = new Date(src.valueOf());
361361
} else if (isRegExp(src)) {
362362
dst[key] = new RegExp(src);
363+
} else if (isElement(src)) {
364+
dst[key] = src[0] ? jqLite(src).clone()[0] : jqLite(src).clone();
363365
} else {
364366
if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
365367
baseExtend(dst[key], [src], true);

test/AngularSpec.js

+26
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,17 @@ describe('angular', function() {
535535

536536
expect(dst.date).toBe(src.date);
537537
});
538+
539+
it('should copy elements by reference', function() {
540+
var src = { element: document.createElement('div'),
541+
jqObject: jqLite("<p><span>s1</span><span>s2</span></p>").find("span") };
542+
var dst = {};
543+
544+
extend(dst, src);
545+
546+
expect(dst.element).toBe(src.element);
547+
expect(dst.jqObject).toBe(src.jqObject);
548+
});
538549
});
539550

540551

@@ -625,6 +636,21 @@ describe('angular', function() {
625636
expect(isRegExp(dst.regexp)).toBe(true);
626637
expect(dst.regexp.toString()).toBe(src.regexp.toString());
627638
});
639+
640+
641+
it('should copy(clone) elements', function() {
642+
var src = { element: document.createElement('div'),
643+
jqObject: jqLite("<p><span>s1</span><span>s2</span></p>").find("span") };
644+
var dst = {};
645+
646+
merge(dst, src);
647+
648+
expect(dst.element).not.toBe(src.element);
649+
expect(dst.jqObject).not.toBe(src.jqObject);
650+
651+
expect(isElement(dst.element)).toBeTruthy();
652+
expect(isElement(dst.jqObject)).toBeTruthy();
653+
});
628654
});
629655

630656

0 commit comments

Comments
 (0)