Skip to content

Commit

Permalink
Merge pull request #832 from msteen/patch-1
Browse files Browse the repository at this point in the history
Consistently check whether the map option as been supplied to compile
  • Loading branch information
vendethiel committed Jan 31, 2016
2 parents e1d6b80 + ff55e06 commit 7816af0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/command.ls
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ switch
print = json or o.print
t.output = LiveScript.compile t.input, {...options, +bare, run, print}
LiveScript.emit 'run' t
t.result = LiveScript.run t.output.toString!, options, do
t.result = LiveScript.run (if o.map is 'none' then t.output else t.output.code), options, do
js: true
context: o.run-context
switch
Expand All @@ -155,7 +155,7 @@ switch
t.output = LiveScript.compile t.input, {...options, json, o.print}
LiveScript.emit 'write' t
if o.print or not filename
then say (if typeof! t.output is 'String' then t.output else t.output.code).trim-right!
then say (if o.map is 'none' then t.output else t.output.code).trim-right!
else write-JS filename, t.output, t.input, base, json
catch then if e?
if LiveScript.listeners 'failure' .length
Expand Down

0 comments on commit 7816af0

Please sign in to comment.