merge master into branch

Author: zdenko

Cakefile

@@ -19,7 +19,7 @@ unless process.env.NODE_DISABLE_COLORS
 header = """
   /**
    * CoffeeScript Compiler v#{CoffeeScript.VERSION}
-   * http://coffeescript.org
+   * https://coffeescript.org
    *
    * Copyright 2011, Jeremy Ashkenas
    * Released under the MIT License
@@ -188,11 +188,9 @@ buildDocs = (watch = no) ->
   # Helpers
   releaseHeader = (date, version, prevVersion) ->
     """
-      <div class="anchor" id="#{version}"></div>
-      <h2 class="header">
-        #{prevVersion and "<a href=\"https://github.com/jashkenas/coffeescript/compare/#{prevVersion}...#{version}\">#{version}</a>" or version}
-        <span class="timestamp"> &mdash; <time datetime="#{date}">#{formatDate date}</time></span>
-      </h2>
+      <h3>#{prevVersion and "<a href=\"https://github.com/jashkenas/coffeescript/compare/#{prevVersion}...#{version}\">#{version}</a>" or version}
+        <span class="timestamp"> &mdash; <time datetime="#{date}">#{date}</time></span>
+      </h3>
     """
 
   monthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
@@ -290,8 +288,8 @@ buildDocs = (watch = no) ->
       else
         "<blockquote class=\"uneditable-code-block\">#{defaultFence.apply @, arguments}</blockquote>"
 
-    (file, searchData) ->
-      md = fs.readFileSync "#{sectionsSourceFolder}/#{file}.md", 'utf-8'
+    (file, bookmark) ->
+      md = fs.readFileSync "#{sectionsSourceFolder}/#{file.replace /\//g, path.sep}.md", 'utf-8'
       md = md.replace /<%= releaseHeader %>/g, releaseHeader
       md = md.replace /<%= majorVersion %>/g, majorVersion
       md = md.replace /<%= fullVersion %>/g, CoffeeScript.VERSION

ISSUE_TEMPLATE.md

@@ -7,7 +7,7 @@ Our issues history stretches back to 2009, so the odds are good that your topic
 If you have a support request or question please use Stack Overflow:
 https://stackoverflow.com/questions/tagged/coffeescript
 
-Issues on GitHub are only related to problems of the CoffeeScript compiler itself and we cannot answer 
+Issues on GitHub are only related to problems of the CoffeeScript compiler itself and we cannot answer
 support questions here.
 -->
 
@@ -21,18 +21,18 @@ with “Proposal:”. Once your issue is reviewed, a maintainer will edit the ti
 of the codebase most relevant to the issue (if applicable).
 
 If your request is that CoffeeScript support a new feature recently arrived to JavaScript, please note
-that we generally only add features that have reached Stage 4 in the specification (in other words, 
+that we generally only add features that have reached Stage 4 in the specification (in other words,
 the syntax is finalized and the feature is approved to be part of the next ES release). You can still
 open an issue, but it will likely be tagged with “[Awaiting Stage 4]” until the relevant ES feature is
-approved for release. See http://coffeescript.org/#contributing
+approved for release. See https://coffeescript.org/#contributing
 
 There are also a handful of JavaScript features that CoffeeScript intentionally does not support.
-Please do not open issues regarding these. They’re listed in http://coffeescript.org/#unsupported
+Please do not open issues regarding these. They’re listed in https://coffeescript.org/#unsupported
 -->
 
 ### Input Code
 <!--- If you're describing a bug, please let us know which sample code reproduces your problem. -->
-<!--- If you have link from http://coffeescript.org/#try or a standalone repo please include that! -->
+<!--- If you have link from https://coffeescript.org/#try or a standalone repo please include that! -->
 
 ```coffee
 your (code) => here

PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,20 @@
 <!--
 Before making a PR please make sure to read our contributing guidelines:
-http://coffeescript.org/#contributing
+https://coffeescript.org/#contributing
 
-For issue references: Add a comma-separated list of a 
-[closing word](https://help.github.com/articles/closing-issues-via-commit-messages/) followed by 
+For issue references: Add a comma-separated list of a
+[closing word](https://help.github.com/articles/closing-issues-via-commit-messages/) followed by
 the ticket number fixed by the PR. It should be underlined in the preview if done correctly.
 
 All new features require tests. All but the most trivial bug fixes should also have new or updated tests.
 
-Ensure that all new code you add to the compiler can be run in the minimum version of Node listed in 
+Ensure that all new code you add to the compiler can be run in the minimum version of Node listed in
 `package.json`. New tests can require newer Node runtimes, but you may need to ensure that such tests
-only run in supported runtimes; see `Cakefile` for examples of how to filter out certain tests in 
+only run in supported runtimes; see `Cakefile` for examples of how to filter out certain tests in
 runtimes that don’t support them.
 
 Please follow the code style of the rest of the CoffeeScript codebase. Write comments in complete
-sentences using Markdown, as the comments become the [annotated source](http://coffeescript.org/#annotated-source).
+sentences using Markdown, as the comments become the [annotated source](https://coffeescript.org/#annotated-source).
 For tests proving a bug is fixed, please mention the issue number in the test description (see examples
 in the codebase).
 

README.md

@@ -53,14 +53,14 @@ Compile a script:
 coffee -c /path/to/script.coffee
 ```
 
-For documentation, usage, and examples, see: http://coffeescript.org/
+For documentation, usage, and examples, see: https://coffeescript.org/
 
 To suggest a feature or report a bug: https://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
 
-Changelog: http://coffeescript.org/#changelog
+Changelog: https://coffeescript.org/#changelog
 
 Our lovely and talented contributors are listed here: https://github.com/jashkenas/coffeescript/contributors

docs/CNAME

@@ -1 +1 @@
-coffeescript.org
+coffeescript.org

docs/v2/annotated-source/browser.html

@@ -124,7 +124,7 @@ <h1>browser.coffee</h1>
 
             <div class="content"><div class='highlight'><pre>
 CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffeescript'</span>
-compile = CoffeeScript.compile</pre></div></div>
+{ compile } = CoffeeScript</pre></div></div>
 
         </li>
 
@@ -135,13 +135,17 @@ <h1>browser.coffee</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>Use standard JavaScript <code>eval</code> to eval code.</p>
+              <p>Use <code>window.eval</code> to evaluate code, rather than just <code>eval</code>, to run the
+script in a clean global scope rather than inheriting the scope of the
+CoffeeScript compiler. (So that <code>cake test:browser</code> also works in Node,
+use either <code>window.eval</code> or <code>global.eval</code> as appropriate).</p>
 
             </div>
 
             <div class="content"><div class='highlight'><pre>CoffeeScript.eval = <span class="hljs-function"><span class="hljs-params">(code, options = {})</span> -&gt;</span>
   options.bare ?= <span class="hljs-literal">on</span>
-  eval compile code, options</pre></div></div>
+  globalRoot = <span class="hljs-keyword">if</span> <span class="hljs-built_in">window</span>? <span class="hljs-keyword">then</span> <span class="hljs-built_in">window</span> <span class="hljs-keyword">else</span> <span class="hljs-built_in">global</span>
+  globalRoot[<span class="hljs-string">'eval'</span>] compile code, options</pre></div></div>
 
         </li>
 

docs/v2/annotated-source/coffeescript.html

@@ -604,7 +604,7 @@ <h1>coffeescript.coffee</h1>
               </div>
               <p>The real Lexer produces a generic stream of tokens. This object provides a
 thin wrapper around it, compatible with the Jison API. We can then pass it
-directly as a “Jison lexer”.</p>
+directly as a “Jison lexer.”</p>
 
             </div>
 

docs/v2/annotated-source/command.html

@@ -897,14 +897,14 @@ <h1>command.coffee</h1>
           To use --transpile, you must have babel-core installed:
             npm install --save-dev babel-core
           And you must save options to configure Babel in one of the places it looks to find its options.
-          See http://coffeescript.org/#transpilation
+          See https://coffeescript.org/#transpilation
         '''</span>
       <span class="hljs-keyword">else</span>
         <span class="hljs-built_in">console</span>.error <span class="hljs-string">'''
           To use --transpile with globally-installed CoffeeScript, you must have babel-core installed globally:
             npm install --global babel-core
           And you must save options to configure Babel in one of the places it looks to find its options, relative to the file being compiled or to the current folder.
-          See http://coffeescript.org/#transpilation
+          See https://coffeescript.org/#transpilation
         '''</span>
       process.exit <span class="hljs-number">1</span>
 

docs/v2/annotated-source/grammar.html

@@ -915,6 +915,7 @@ <h2 id="grammatical-rules">Grammatical Rules</h2>
     o <span class="hljs-string">':: Property'</span>,                            <span class="hljs-function">-&gt;</span> [LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Access <span class="hljs-keyword">new</span> PropertyName(<span class="hljs-string">'prototype'</span>)), LOC(<span class="hljs-number">2</span>)(<span class="hljs-keyword">new</span> Access $<span class="hljs-number">2</span>)]
     o <span class="hljs-string">'?:: Property'</span>,                           <span class="hljs-function">-&gt;</span> [LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Access <span class="hljs-keyword">new</span> PropertyName(<span class="hljs-string">'prototype'</span>), <span class="hljs-string">'soak'</span>), LOC(<span class="hljs-number">2</span>)(<span class="hljs-keyword">new</span> Access $<span class="hljs-number">2</span>)]
     o <span class="hljs-string">'::'</span>,                                     <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Access <span class="hljs-keyword">new</span> PropertyName <span class="hljs-string">'prototype'</span>
+    o <span class="hljs-string">'?::'</span>,                                    <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Access <span class="hljs-keyword">new</span> PropertyName(<span class="hljs-string">'prototype'</span>), <span class="hljs-string">'soak'</span>
     o <span class="hljs-string">'Index'</span>
   ]</pre></div></div>
 
@@ -1748,7 +1749,7 @@ <h2 id="grammatical-rules">Grammatical Rules</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-69">&#182;</a>
               </div>
-              <p><a href="http://coffeescript.org/#existential-operator">The existential operator</a>.</p>
+              <p><a href="https://coffeescript.org/#existential-operator">The existential operator</a>.</p>
 
             </div>