merged

jashkenas · Aug 26, 2014 · 53aa50f · 53aa50f
2 parents e8c96de + 81047d4
commit 53aa50f
Show file tree

Hide file tree

Showing 99 changed files with 4,746 additions and 3,217 deletions.
diff --git a/Cakefile b/Cakefile
@@ -104,7 +104,7 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options)
   console.log   "Linking 'coffee' to #{bin}/coffee"
   exec([
     "mkdir -p #{lib} #{bin}"
-    "cp -rf bin lib LICENSE README package.json src #{lib}"
+    "cp -rf bin lib LICENSE README.md package.json src #{lib}"
     "ln -sfn #{lib}/bin/coffee #{bin}/coffee"
     "ln -sfn #{lib}/bin/cake #{bin}/cake"
     "mkdir -p ~/.node_libraries"
@@ -173,11 +173,13 @@ task 'doc:site', 'watch and continually rebuild the documentation for the websit
 
   do renderIndex = ->
     codeSnippetCounter = 0
-    rendered = _.template fs.readFileSync(source, 'utf-8'), codeFor: codeFor()
+    rendered = _.template fs.readFileSync(source, 'utf-8'),
+      codeFor: codeFor()
+      releaseHeader: releaseHeader
     fs.writeFileSync 'index.html', rendered
     log "compiled", green, "#{source}"
 
-  fs.watchFile source, internal: 200, renderIndex
+  fs.watchFile source, interval: 200, renderIndex
   log "watching..." , green
 
 

diff --git a/README b/README
@@ -38,13 +38,13 @@
   http://coffeescript.org/
 
   To suggest a feature, report a bug, or general discussion:
-  http://github.com/jashkenas/coffee-script/issues/
+  http://github.com/jashkenas/coffeescript/issues/
 
   If you'd like to chat, drop by #coffeescript on Freenode IRC,
   or on webchat.freenode.net.
 
   The source repository:
-  git://github.com/jashkenas/coffee-script.git
+  git://github.com/jashkenas/coffeescript.git
 
   Top 100 contributors are listed here:
-  http://github.com/jashkenas/coffee-script/contributors
+  http://github.com/jashkenas/coffeescript/contributors
diff --git a/README.md b/README.md
@@ -0,0 +1,60 @@
+            {
+         }   }   {
+        {   {  }  }
+         }   }{  {
+        {  }{  }  }                    _____       __  __
+       { }{ }{  { }                   / ____|     / _|/ _|
+     .- { { }  { }} -.               | |     ___ | |_| |_ ___  ___
+    (  { } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \
+    |`-..________ ..-'|              | |___| (_) | | | ||  __/  __/
+    |                 |               \_____\___/|_| |_| \___|\___|
+    |                 ;--.
+    |                (__  \            _____           _       _
+    |                 | )  )          / ____|         (_)     | |
+    |                 |/  /          | (___   ___ _ __ _ _ __ | |_
+    |                 (  /            \___ \ / __| '__| | '_ \| __|
+    |                 |/              ____) | (__| |  | | |_) | |_
+    |                 |              |_____/ \___|_|  |_| .__/ \__|
+     `-.._________..-'                                  | |
+                                                        |_|
+
+CoffeeScript is a little language that compiles into JavaScript.
+
+## Installation
+
+If you have the node package manager, npm, installed:
+
+```shell
+npm install -g coffee-script
+```
+
+Leave off the `-g` if you don't wish to install globally. If you don't wish to use npm:
+
+```shell
+git clone https://github.com/jashkenas/coffeescript.git
+sudo coffeescript/bin/cake install
+```
+
+## Getting Started
+
+Execute a script:
+
+```shell
+coffee /path/to/script.coffee
+```
+
+Compile a script:
+
+```shell
+coffee -c /path/to/script.coffee
+```
+
+For documentation, usage, and examples, see: http://coffeescript.org/
+
+To suggest a feature or report a bug: http://github.com/jashkenas/coffeescript/issues
+
+If you'd like to chat, drop by #coffeescript on Freenode IRC.
+
+The source repository: https://github.com/jashkenas/coffeescript.git
+
+Our lovely and talented contributors are listed here: http://github.com/jashkenas/coffeescript/contributors
diff --git a/documentation/css/docs.css b/documentation/css/docs.css
@@ -81,14 +81,15 @@ code, pre, tt, textarea {
       padding-left: 0;
     }
 .timestamp {
-  font-size: 12px;
+  font-size: 11px;
   font-weight: normal;
-  color: black;
+  text-transform: uppercase;
+}
+div.anchor {
+  position: relative;
+  top: -90px;
+  margin: 0 0 -20px;
 }
-  .timestamp small {
-    font-size: 11px;
-    text-transform: uppercase;
-  }
 div.code {
   position: relative;
   background: #fff;
@@ -154,22 +155,6 @@ div.code {
     #logo img {
       margin: 5px 0 0 3px;
     }
-  #error {
-    position: absolute;
-    -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;
-    -webkit-border-top-left-radius: 0; -moz-border-radius-topleft: 0; border-top-left-radius: 0;
-    -webkit-border-bottom-left-radius: 0; -moz-border-radius-bottomleft: 0; border-bottom-left-radius: 0;
-    right: 0px; top: 0px; left: 726px; bottom: 0;
-    padding: 0 0 0 15px;
-    background: #fdcdcc;
-    background: -webkit-gradient(linear, left top, left bottom, from(#ffedec), to(#ff9a95));
-    background: -moz-linear-gradient(top, #f8f8f8, #dadada);
-    color: #862322;
-    font-size: 10px;
-    line-height: 50px;
-    overflow: hidden;
-    text-transform: uppercase;
-  }
   .navigation {
     height: 50px;
     font-size: 11px;
@@ -321,6 +306,9 @@ div.code {
     margin-bottom: 0;
     top: 10px; left: 10px; right: 10px; bottom: 15px;
   }
+    #repl_results.error {
+      color: red
+    }
     #repl_source_wrap {
       margin-left: 5px;
       width: 47%; right: 50%;
@@ -383,3 +371,9 @@ div.code {
     background-image: url(../images/button_bg_dark.gif);
     text-shadow: none;
   }
+  .minibutton.error {
+     opacity: 0.5;
+     color: #600;
+     cursor: not-allowed;
+  }
+
diff --git a/documentation/docs/browser.html b/documentation/docs/browser.html
@@ -16,83 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
 
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
 
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
 
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
 
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
 
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
 
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
 
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
 
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
 
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
 
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
 
-              <a class="source" href="register.html">
-                register.coffee
-              </a>
-
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
 
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
 
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
 
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
 
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-
+
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+
+            </div>
           </div>
         </li>
       </ul>
@@ -120,7 +122,8 @@ <h1>browser.coffee</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre>CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
+            <div class="content"><div class='highlight'><pre>
+CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
 CoffeeScript.<span class="hljs-built_in">require</span> = <span class="hljs-built_in">require</span>
 compile = CoffeeScript.compile</pre></div></div>
 
@@ -168,7 +171,7 @@ <h1>browser.coffee</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>If we&#39;re not in a browser environment, we&#39;re finished with the public API.</p>
+              <p>If we’re not in a browser environment, we’re finished with the public API.</p>
 
             </div>
 
@@ -183,8 +186,8 @@ <h1>browser.coffee</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Include source maps where possible. If we&#39;ve got a base64 encoder, a
-JSON serializer, and tools for escaping unicode characters, we&#39;re good to go.
+              <p>Include source maps where possible. If we’ve got a base64 encoder, a
+JSON serializer, and tools for escaping unicode characters, we’re good to go.
 Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">https://developer.mozilla.org/en-US/docs/DOM/window.btoa</a></p>
 
             </div>