disallowing --watch and --join together for the time being.

This commit is contained in:
Jeremy Ashkenas 2010-12-23 22:22:34 -08:00
parent 7710528f01
commit 385be63126
2 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@
return compileScript(source, code.toString(), base);
}
});
if (opts.watch) {
if (opts.watch && !opts.join) {
return watch(source, base);
}
}

View File

@ -89,7 +89,7 @@ compileScripts = ->
compileJoin() if helpers.compact(contents).length is sources.length
else
compileScript(source, code.toString(), base)
watch source, base if opts.watch
watch source, base if opts.watch and not opts.join
compile source, true
# Compile a single source script, containing the given code, according to the