Merge branch 'master' into gh-pages

This commit is contained in:
Jeremy Ashkenas
2011-11-09 12:53:27 -05:00
4 changed files with 5 additions and 4 deletions

View File

@@ -189,7 +189,7 @@ sudo bin/cake install</pre>
<p>
If installing on Ubuntu or Debian,
<a href="http://opinionated-programmer.com/2010/12/installing-coffeescript-on-debian-or-ubuntu/">be
<a href="http://opinionatedprogrammer.com/2010/12/installing-coffeescript-on-debian-or-ubuntu/">be
careful not to use the existing out-of-date package</a>. If installing on
Windows, your best bet is probably to run Node.js under Cygwin. If you'd
just like to experiment, you can try the

File diff suppressed because one or more lines are too long

View File

@@ -275,7 +275,7 @@ sudo bin/cake install</pre>
<p>
If installing on Ubuntu or Debian,
<a href="http://opinionated-programmer.com/2010/12/installing-coffeescript-on-debian-or-ubuntu/">be
<a href="http://opinionatedprogrammer.com/2010/12/installing-coffeescript-on-debian-or-ubuntu/">be
careful not to use the existing out-of-date package</a>. If installing on
Windows, your best bet is probably to run Node.js under Cygwin. If you'd
just like to experiment, you can try the

View File

@@ -4,8 +4,9 @@ CoffeeScript = require './coffee-script'
CoffeeScript.require = require
# Use standard JavaScript `eval` to eval code.
global ?= this
CoffeeScript.eval = (code, options) ->
eval CoffeeScript.compile code, options
global.eval CoffeeScript.compile code, options
# Running code does not provide access to this scope.
CoffeeScript.run = (code, options = {}) ->