improving CoffeeScript in browser script activation, and updating docs

2022-11-09 12:23:24 -05:00 · 2010-02-25 06:26:27 -05:00 · 2010-02-25 06:26:27 -05:00 · b32a60585b
commit b32a60585b
parent 66a6568fe7
5 changed files with 33 additions and 99 deletions
--- a/documentation/index.html.erb
+++ b/documentation/index.html.erb
@ -734,10 +734,10 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
    <p>
      While it's not recommended for serious use, CoffeeScripts may be included
      directly within the browser using <tt>&lt;script type="text/coffeescript"&gt;</tt>
-      tags. The codebase includes a compressed and minified version of the compiler
-      (<a href="extras/coffee-script.js">Download current version here, 43k when gzipped</a>).
-      Include <tt>coffee-script.js</tt> on the page <b>after</b> any <tt>text/coffeescript</tt> tags
-      with inline CoffeeScript, and it will compile and evaluate them in order.
+      tags. The source includes a compressed and minified version of the compiler
+      (<a href="extras/coffee-script.js">Download current version here, 43k when gzipped</a>)
+      as <tt>extras/coffee-script.js</tt>. Include this file on a page with 
+      inline CoffeeScript tags, and it will compile and evaluate them in order.
    </p>

    <p>
--- a/extras/coffee-script.js
+++ b/extras/coffee-script.js
--- a/index.html
+++ b/index.html
@ -133,89 +133,7 @@ alert <span class="String"><span class="String">&quot;</span>I knew it!<span cla

 <span class="Comment"><span class="Comment">#</span> Array comprehensions:</span>
 <span class="FunctionName">cubed_list</span><span class="Keyword">:</span> math.cube num <span class="Keyword">for</span> num <span class="Keyword">in</span> list
-</pre><pre class="idle"><span class="Storage">var</span> _a, _b, _c, cubed_list, list, math, num, number, opposite_day, race, square;
-<span class="Comment"><span class="Comment">//</span> Assignment:</span>
-number <span class="Keyword">=</span> <span class="Number">42</span>;
-opposite_day <span class="Keyword">=</span> <span class="BuiltInConstant">true</span>;
-<span class="Comment"><span class="Comment">//</span> Conditions:</span>
-<span class="Keyword">if</span> (opposite_day) {
-  number <span class="Keyword">=</span> <span class="Keyword">-</span><span class="Number">42</span>;
-}
-<span class="Comment"><span class="Comment">//</span> Functions:</span>
-square <span class="Keyword">=</span> <span class="Storage">function</span> <span class="FunctionName">square</span>(<span class="FunctionArgument">x</span>) {
-  <span class="Keyword">return</span> x <span class="Keyword">*</span> x;
-};
-<span class="Comment"><span class="Comment">//</span> Arrays:</span>
-list <span class="Keyword">=</span> [<span class="Number">1</span>, <span class="Number">2</span>, <span class="Number">3</span>, <span class="Number">4</span>, <span class="Number">5</span>];
-<span class="Comment"><span class="Comment">//</span> Objects:</span>
-math <span class="Keyword">=</span> {
-  root: <span class="LibraryClassType">Math</span>.sqrt,
-  square: square,
-  cube: <span class="Storage">function</span> <span class="FunctionName">cube</span>(<span class="FunctionArgument">x</span>) {
-    <span class="Keyword">return</span> x <span class="Keyword">*</span> square(x);
-  }
-};
-<span class="Comment"><span class="Comment">//</span> Splats:</span>
-race <span class="Keyword">=</span> <span class="Storage">function</span> <span class="FunctionName">race</span>(<span class="FunctionArgument">winner</span>) {
-  <span class="Storage">var</span> runners;
-  runners <span class="Keyword">=</span> <span class="LibraryClassType">Array</span>.<span class="LibraryConstant">prototype</span>.slice.<span class="LibraryFunction">call</span>(arguments, <span class="Number">1</span>);
-  <span class="Keyword">return</span> <span class="LibraryFunction">print</span>(winner, runners);
-};
-<span class="Comment"><span class="Comment">//</span> Existence:</span>
-<span class="Keyword">if</span> ((<span class="Keyword">typeof</span> elvis <span class="Keyword">!</span><span class="Keyword">==</span> <span class="String"><span class="String">&quot;</span>undefined<span class="String">&quot;</span></span> <span class="Keyword">&amp;</span><span class="Keyword">&amp;</span> elvis <span class="Keyword">!</span><span class="Keyword">==</span> <span class="BuiltInConstant">null</span>)) {
-  <span class="LibraryFunction">alert</span>(<span class="String"><span class="String">&quot;</span>I knew it!<span class="String">&quot;</span></span>);
-}
-<span class="Comment"><span class="Comment">//</span> Array comprehensions:</span>
-cubed_list <span class="Keyword">=</span> (<span class="Storage">function</span>() {
-  _a <span class="Keyword">=</span> []; _b <span class="Keyword">=</span> list;
-  <span class="Keyword">for</span> (_c <span class="Keyword">=</span> <span class="Number">0</span>; _c <span class="Keyword">&lt;</span> _b.<span class="LibraryConstant">length</span>; _c<span class="Keyword">++</span>) {
-    num <span class="Keyword">=</span> _b[_c];
-    _a.<span class="LibraryFunction">push</span>(math.cube(num));
-  }
-  <span class="Keyword">return</span> _a;
-}).<span class="LibraryFunction">call</span>(<span class="Variable">this</span>);
-</pre><button onclick='javascript: var _a, _b, _c, cubed_list, list, math, num, number, opposite_day, race, square;
-// Assignment:
-number = 42;
-opposite_day = true;
-// Conditions:
-if (opposite_day) {
-  number = -42;
-}
-// Functions:
-square = function square(x) {
-  return x * x;
-};
-// Arrays:
-list = [1, 2, 3, 4, 5];
-// Objects:
-math = {
-  root: Math.sqrt,
-  square: square,
-  cube: function cube(x) {
-    return x * square(x);
-  }
-};
-// Splats:
-race = function race(winner) {
-  var runners;
-  runners = Array.prototype.slice.call(arguments, 1);
-  return print(winner, runners);
-};
-// Existence:
-if ((typeof elvis !== "undefined" && elvis !== null)) {
-  alert("I knew it!");
-}
-// Array comprehensions:
-cubed_list = (function() {
-  _a = []; _b = list;
-  for (_c = 0; _c < _b.length; _c++) {
-    num = _b[_c];
-    _a.push(math.cube(num));
-  }
-  return _a;
-}).call(this);
-;alert(cubed_list);'>run: cubed_list</button><br class='clear' /></div>
+</pre><pre class="idle"></pre><button onclick='javascript: ;alert(cubed_list);'>run: cubed_list</button><br class='clear' /></div>

    <p>
      For a longer CoffeeScript example, check out
@ -1614,10 +1532,10 @@ task(<span class="String"><span class="String">'</span>test<span class="String">
    <p>
      While it's not recommended for serious use, CoffeeScripts may be included
      directly within the browser using <tt>&lt;script type="text/coffeescript"&gt;</tt>
-      tags. The codebase includes a compressed and minified version of the compiler
-      (<a href="extras/coffee-script.js">Download current version here, 43k when gzipped</a>).
-      Include <tt>coffee-script.js</tt> on the page <b>after</b> any <tt>text/coffeescript</tt> tags
-      with inline CoffeeScript, and it will compile and evaluate them in order.
+      tags. The source includes a compressed and minified version of the compiler
+      (<a href="extras/coffee-script.js">Download current version here, 43k when gzipped</a>)
+      as <tt>extras/coffee-script.js</tt>. Include this file on a page with 
+      inline CoffeeScript tags, and it will compile and evaluate them in order.
    </p>

    <p>
--- a/lib/coffee-script.js
+++ b/lib/coffee-script.js
@ -1,5 +1,5 @@
 (function(){
-  var _a, _b, lexer, parser, path, tag;
+  var lexer, parser, path, process_scripts;
  // Set up for both the browser and the server.
  if ((typeof process !== "undefined" && process !== null)) {
    process.mixin(require('nodes'));
@ -48,10 +48,21 @@
  // Activate CoffeeScript in the browser by having it compile and eval
  // all script tags with a content-type of text/coffeescript.
  if ((typeof document !== "undefined" && document !== null) && document.getElementsByTagName) {
-    _a = document.getElementsByTagName('script');
-    for (_b = 0; _b < _a.length; _b++) {
-      tag = _a[_b];
-      tag.type === 'text/coffeescript' ? eval(exports.compile(tag.innerHTML)) : null;
+    process_scripts = function process_scripts() {
+      var _a, _b, _c, tag;
+      _a = []; _b = document.getElementsByTagName('script');
+      for (_c = 0; _c < _b.length; _c++) {
+        tag = _b[_c];
+        if (tag.type === 'text/coffeescript') {
+          _a.push(eval(exports.compile(tag.innerHTML)));
+        }
+      }
+      return _a;
+    };
+    if (window.addEventListener) {
+      window.addEventListener('load', process_scripts, false);
+    } else if (window.attachEvent) {
+      window.attachEvent('onload', process_scripts);
    }
  }
 })();
--- a/src/coffee-script.coffee
+++ b/src/coffee-script.coffee
@ -41,5 +41,10 @@ exports.tree: (code) ->
 # Activate CoffeeScript in the browser by having it compile and eval
 # all script tags with a content-type of text/coffeescript.
 if document? and document.getElementsByTagName
-  for tag in document.getElementsByTagName('script') when tag.type is 'text/coffeescript'
-    eval exports.compile tag.innerHTML
+  process_scripts: ->
+    for tag in document.getElementsByTagName('script') when tag.type is 'text/coffeescript'
+      eval exports.compile tag.innerHTML
+  if window.addEventListener
+    window.addEventListener 'load', process_scripts, false
+  else if window.attachEvent
+    window.attachEvent 'onload', process_scripts