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

Commit 65078db

Browse files
committed
fix(merge): treat dates as atomic values instead of objects.
Makes angular.merge copy dates correctly. Closes #11720
1 parent 40e00cd commit 65078db

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/Angular.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,12 @@ function baseExtend(dst, objs, deep) {
335335
var src = obj[key];
336336

337337
if (deep && isObject(src)) {
338-
if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
339-
baseExtend(dst[key], [src], true);
338+
if (isDate(src)) {
339+
dst[key] = new Date(src.valueOf());
340+
} else {
341+
if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
342+
baseExtend(dst[key], [src], true);
343+
}
340344
} else {
341345
dst[key] = src;
342346
}

0 commit comments

Comments
 (0)