Use _.extend instead of the hand-rolled merge

2026-02-18 11:31:20 -05:00 · 2010-02-13 08:50:29 -05:00
parent 8c077f0f65
commit dd6be80fca
2 changed files with 9 additions and 23 deletions
--- a/src/nodes.coffee
+++ b/src/nodes.coffee
@@ -20,11 +20,10 @@ flatten: (list) ->
  memo

 # Merge objects.
-merge: (src, dest) ->
-  fresh: {}
-  (fresh[key]: val) for key, val of src
-  (fresh[key]: val) for key, val of dest
-  fresh
+merge: (options, overrides) ->
+  _.tap {}, (fresh) ->
+    _.extend fresh, options
+    _.extend fresh, overrides

 # Delete a key from an object, returning the value.
 del: (obj, key) ->