Merge pull request #4381 from GeoffreyBooth/1.12

[WIP] 1.12.0

Author: lydell

Cakefile

@@ -146,14 +146,14 @@ task 'doc:site', 'watch and continually rebuild the documentation for the websit
       if file in ['generator_iteration', 'generators', 'modules']
         cshtml = cshtml.replace /(yield|import|export|from|as|default) /g, '<span class="keyword">$1</span> '
       jshtml = "<pre><code>#{hljs.highlight('javascript', js).value}</code></pre>"
-      append = if executable is yes then '' else "alert(#{executable});"
+      append = if executable is yes then '' else "alert(#{executable});".replace /"/g, '&quot;'
       if executable and executable isnt yes
         cs.replace /(\S)\s*\Z/m, "$1\n\nalert #{executable}"
       run    = if executable is true then 'run' else "run: #{executable}"
       name   = "example#{counter}"
       script = "<script>window.#{name} = #{JSON.stringify cs}</script>"
       load   = if showLoad then "<div class='minibutton load' onclick='javascript: loadConsole(#{name});'>load</div>" else ''
-      button = if executable then "<div class='minibutton ok' onclick='javascript: #{js};#{append}'>#{run}</div>" else ''
+      button = if executable then """<div class="minibutton ok" onclick="javascript: #{js.replace /"/g, '&quot;'};#{append}">#{run}</div>""" else ''
       "<div class='code'>#{cshtml}#{jshtml}#{script}#{load}#{button}<br class='clear' /></div>"
 
   monthNames = [
@@ -221,6 +221,7 @@ task 'doc:site', 'watch and continually rebuild the documentation for the websit
       codeFor: codeFor()
       releaseHeader: releaseHeader
       majorVersion: majorVersion
+      fullVersion: CoffeeScript.VERSION
     fs.writeFileSync "docs/v#{majorVersion}/index.html", output
     log 'compiled', green, "#{indexFile} → docs/v#{majorVersion}/index.html"