mirror of
https://github.com/jashkenas/coffeescript.git
synced 2026-02-17 19:11:22 -05:00
Use _.extend instead of the hand-rolled merge
This commit is contained in:
@@ -25,24 +25,11 @@
|
||||
return memo;
|
||||
};
|
||||
// Merge objects.
|
||||
merge = function merge(src, dest) {
|
||||
var __a, __b, fresh, key, val;
|
||||
fresh = {};
|
||||
__a = src;
|
||||
for (key in __a) {
|
||||
val = __a[key];
|
||||
if (__hasProp.call(__a, key)) {
|
||||
((fresh[key] = val));
|
||||
}
|
||||
}
|
||||
__b = dest;
|
||||
for (key in __b) {
|
||||
val = __b[key];
|
||||
if (__hasProp.call(__b, key)) {
|
||||
((fresh[key] = val));
|
||||
}
|
||||
}
|
||||
return fresh;
|
||||
merge = function merge(options, overrides) {
|
||||
return _.tap({}, function(fresh) {
|
||||
_.extend(fresh, options);
|
||||
return _.extend(fresh, overrides);
|
||||
});
|
||||
};
|
||||
// Delete a key from an object, returning the value.
|
||||
del = function del(obj, key) {
|
||||
|
||||
Reference in New Issue
Block a user