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

Merge branch 'master' into top-secret

Browse Source 
# Conflicts:
#	packages/babylon/src/options.js
#	src/acorn/plugins/flow.js
#	src/acorn/src/util.js
This commit is contained in:
Sebastian McKenzie
2015-07-11 21:04:33 +01:00
parent ff6620c8ea f757ca01a1
commit a08c21302d
3 changed files with 176 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/options.js
View File

@@ -95,11 +95,12 @@ export function getOptions(opts) {
options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt];
if (Array.isArray(options.onToken)) {
let tokens = options.onToken;
options.onToken = (token) => tokens.push(token);
let tokens = options.onToken
options.onToken = (token) => tokens.push(token)
}
if (Array.isArray(options.onComment)) {
options.onComment = pushComment(options, options.onComment)
}
if (Array.isArray(options.onComment))
options.onComment = pushComment(options, options.onComment);
return options;
}