Merge branch 'v4.5.0'

goofychris · Apr 25, 2017 · 5aee242 · 5aee242
2 parents 1b9d81d + dccaace
commit 5aee242
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/lib/template-node.js b/lib/template-node.js
@@ -249,11 +249,22 @@ function extend(options) {
     var copy = Object.create(this);
 
     for (var name in options) {
+
+        var object = void 0;
         var value = options[name];
         var type = toType(value);
 
-        if (type === 'Array' || type === 'Object') {
-            copy[name] = extend.call(copy[name], value);
+        if (type === 'Object') {
+            object = Object.create(copy[name]);
+        } else if (type === 'Array') {
+            object = [].concat(copy[name]);
+        }
+
+        if (object) {
+            for (var index in value) {
+                object[index] = value[index];
+            }
+            copy[name] = object;
         } else {
             copy[name] = value;
         }

diff --git a/lib/template-web.js b/lib/template-web.js
diff --git a/src/compile/defaults.js b/src/compile/defaults.js
@@ -23,14 +23,25 @@ const toType = value => {
  * @return {Object}
  */
 function extend(options) {
-    const copy = Object.create(this);
+    let copy = Object.create(this);
 
     for (let name in options) {
+
+        let object;
         const value = options[name];
         const type = toType(value);
 
-        if (type === 'Array' || type === 'Object') {
-            copy[name] = extend.call(copy[name], value);
+        if (type === 'Object') {
+            object = Object.create(copy[name]);
+        } else if (type === 'Array') {
+            object = [].concat(copy[name]);
+        }
+
+        if (object) {
+            for (let index in value) {
+                object[index] = value[index];
+            }
+            copy[name] = object;
         } else {
             copy[name] = value;
         }

diff --git a/test/compile/defaults.js b/test/compile/defaults.js
@@ -30,15 +30,6 @@ module.exports = {
             assert.deepEqual(null, options.rules[0]);
             assert.deepEqual(rules[1], options.rules[1]);
             assert.deepEqual(length, rules.length);
-
-            // const rules = defaults.rules;
-            // const length = rules.length;
-            // const options = defaults.$extend({
-            //     rules: []
-            // });
-
-            // assert.deepEqual(0, options.rules.length);
-            // assert.deepEqual(length, rules.length);
         }
     }
 };