Skip to content

Commit

Permalink
fix extendDeep copying methods from prototype
Browse files Browse the repository at this point in the history
in removing deprecated __lookupGetter__ and then fixing when it was
undefined the simple copy case was lost.  This delta restores that case.
  • Loading branch information
Michael Hunter committed May 22, 2016
1 parent 72b3746 commit 3b221d7
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions lib/config.js
Expand Up @@ -1416,11 +1416,10 @@ util.extendDeep = function(mergeInto) {
}

// Copy property descriptor otherwise, preserving accessors
else {
var descriptor = Object.getOwnPropertyDescriptor(Object(mergeFrom), prop);
if (descriptor) {
Object.defineProperty(mergeInto, prop, descriptor);
}
else if (Object.getOwnPropertyDescriptor(Object(mergeFrom), prop)){
Object.defineProperty(mergeInto, prop, Object.getOwnPropertyDescriptor(Object(mergeFrom), prop));
} else {
mergeInto[prop] = mergeFrom[prop];
}
}
});
Expand Down

0 comments on commit 3b221d7

Please sign in to comment.