Fixes #18978, Add support for Date objects to deepCopy.

JoeNemo · Apr 1, 2017 · 2aa295a · 2aa295a
1 parent bf3e3a3
commit 2aa295a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/request/util.js b/request/util.js
@@ -15,7 +15,11 @@ define([
 				sval = source[name];
 			if(tval !== sval){
 				if(tval && typeof tval === 'object' && sval && typeof sval === 'object'){
-					exports.deepCopy(tval, sval);
+					if(sval instanceof Date){
+						target[name] = new Date(sval);
+					}else{
+						exports.deepCopy(tval, sval);
+					}
 				}else{
 					target[name] = sval;
 				}

diff --git a/tests/unit/request/util.js b/tests/unit/request/util.js
@@ -0,0 +1,36 @@
+define([
+	'intern!object',
+	'intern/chai!assert',
+	'../../../request/util'
+], function (registerSuite, assert, util) {
+	registerSuite({
+		name: 'dojo/request/util',
+
+		'deepCopy': function () {
+            var object1 = {
+                apple: 0,
+                banana: {
+                    weight: 52,
+                    price: 100,
+                    code: "B12345", 
+                    purchased: new Date(2016, 0, 1)
+                },
+                cherry: 97
+            };
+            var object2 = {
+                banana: {
+                    price: 200,
+                    code: "B98765", 
+                    purchased: new Date(2017, 0, 1)
+                },
+                durian: 100
+            };
+            util.deepCopy(object1, object2);
+			assert.strictEqual(object1.banana.weight, 52);
+			assert.strictEqual(object1.banana.price, 200);
+			assert.strictEqual(object1.banana.code, "B98765");
+			assert.equal(object1.banana.purchased.getTime(), new Date(2017, 0, 1).getTime());
+		}
+
+	});
+});