diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2016-01-15 03:01:33 +0300 |
|---|---|---|
| committer | Rebecca Turner <me@re-becca.org> | 2016-01-21 04:08:38 +0300 |
| commit | c62f414534971761a48ce3cbc3e25214fb09e494 (patch) | |
| tree | 8001c01036a1b19a5d1f1d1b304b6053fb204bed /node_modules/glob/glob.js | |
| parent | 310930395c9bf1577cf085b9742210bfc71bb019 (diff) | |
glob@6.0.4
Diffstat (limited to 'node_modules/glob/glob.js')
| -rw-r--r-- | node_modules/glob/glob.js | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js index 022d2ac8c..a62da27eb 100644 --- a/node_modules/glob/glob.js +++ b/node_modules/glob/glob.js @@ -80,8 +80,21 @@ var GlobSync = glob.GlobSync = globSync.GlobSync // old api surface glob.glob = glob +function extend (origin, add) { + if (add === null || typeof add !== 'object') { + return origin + } + + var keys = Object.keys(add) + var i = keys.length + while (i--) { + origin[keys[i]] = add[keys[i]] + } + return origin +} + glob.hasMagic = function (pattern, options_) { - var options = util._extend({}, options_) + var options = extend({}, options_) options.noprocess = true var g = new Glob(pattern, options) |