Merge branch 'master' of github.com:babel/babel

This commit is contained in:
Sebastian McKenzie 2015-04-21 16:14:49 +01:00
commit dc2a20dbcd

View File

@ -243,7 +243,7 @@ export default class File {
if (name) { if (name) {
if (typeof name === "object" && name.transformer) { if (typeof name === "object" && name.transformer) {
plugin = name.transformer; plugin = name.transformer;
position ||= name.position; position = name.position || position;
} else if (typeof name === "string") { } else if (typeof name === "string") {
// this is a plugin in the form of "foobar" or "foobar:after" // this is a plugin in the form of "foobar" or "foobar:after"
// where the optional colon is the delimiter for plugin position in the transformer stack // where the optional colon is the delimiter for plugin position in the transformer stack