cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into experimental

Browse Source 
Conflicts:
	README.md
	lib/6to5/register.js
This commit is contained in:
Sebastian McKenzie
2014-11-07 13:54:59 +11:00
parent 56ac964e54 fcbd315bc1
commit b3206d94a6
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/6to5/register.js
View File

@@ -97,7 +97,7 @@ module.exports = function (opts) {
// normalise options
opts = opts || {};
if (_.isRegExp(opts)) opts = { ignore: opts };
opts.ignore = opts.ignore || opts.ignoreRegex;
if (opts.ignoreRegex != null) opts.ignore = opts.ignoreRegex;
if (opts.only != null) onlyRegex = opts.only;
if (opts.ignore != null) ignoreRegex = opts.ignore;