Skip to content

Commit

Permalink
fix: whoops, let's make the assign not change the Object key order
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Coe committed Sep 30, 2016
1 parent b43b7c1 commit 29d069a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -695,12 +695,12 @@ function assign (defaults, configuration) {
var o = {}
configuration = configuration || {}

Object.keys(defaults).forEach(function (k) {
o[k] = defaults[k]
})
Object.keys(configuration).forEach(function (k) {
o[k] = configuration[k]
})
Object.keys(defaults).forEach(function (k) {
if (o[k] === undefined) o[k] = defaults[k]
})

return o
}
Expand Down

0 comments on commit 29d069a

Please sign in to comment.