Merge branch 'master' of git://github.com/pivotal/jasmine

README.markdown

@@ -1,19 +1,20 @@
-[Jasmine](http://pivotal.github.com/jasmine)
+<a name="README">[Jasmine](http://pivotal.github.com/jasmine)</a>
 =======
 **A JavaScript Testing Framework**
 
 Quick Start
 ----------
 
-1. Get the latest release from the [downloads page](http://github.com/pivotal/jasmine/downloads).
+#### For JavaScript-only projects:
+1. Get the latest release from the [downloads page](http://pivotal.github.com/jasmine/).
 2. Open `SpecRunner.html` in your favorite browser.
 
-For running within a Ruby environment, including automated execution with Selenium, please use
+#### Other distributions:
-the [jasmine gem](http://github.com/pivotal/jasmine-gem).
+* For integration with the Ruby environment, including automated execution with Selenium, please use the [jasmine gem](http://github.com/pivotal/jasmine-gem).
 
 ### Which Release Should I Use?
 
-Please use the latest version unless you have a good reason not to. Some of this documentation may not be applicable to older versions. Please see [[Release Notes]](http://wiki.github.com/pivotal/jasmine/release-notes) for change information.
+Please use the latest version unless you have a good reason not to. Some of this documentation may not be applicable to older versions. Please see [Release Notes](http://pivotal.github.com/jasmine/release-notes) for change information.
 
 Why Another JavaScript TDD/BDD Framework?
 -----------

Rakefile

@@ -157,11 +157,11 @@ jasmine.version_= {
 
       fn = f.sub(/^pages\//, '')
       version = /jasmine-standalone-(.*).zip/.match(f)[1]
-      download_html += "<td><a href='#{fn}'>#{fn.sub(/downloads\//, '')}</a></td>"
+      download_html += "<td class=\"link\"><a href='#{fn}'>#{fn.sub(/downloads\//, '')}</a></td>\n"
-      download_html += "<td>#{version}</td>\n"
+      download_html += "<td class=\"version\">#{version}</td>\n"
-      download_html += "<td>#{File.size(f) / 1024}k</td>\n"
+      download_html += "<td class=\"size\">#{File.size(f) / 1024}k</td>\n"
-      download_html += "<td>#{File.mtime(f).strftime("%Y/%m/%d %H:%M:%S")}</td>\n"
+      download_html += "<td class=\"date\">#{File.mtime(f).strftime("%Y/%m/%d %H:%M:%S %Z")}</td>\n"
-      download_html += "<td>#{sha1}</td>\n"
+      download_html += "<td class=\"sha\">#{sha1}</td>\n"
     end
     download_html += "</table>\n<!-- END_DOWNLOADS -->"
 

lib/consolex.js

@@ -1,28 +0,0 @@
-/** Console X
-* http://github.com/deadlyicon/consolex.js
-*
-* By Jared Grippe <jared@jaredgrippe.com>
-*
-* Copyright (c) 2009 Jared Grippe
-* Licensed under the MIT license.
-*
-* consolex avoids ever having to see javascript bugs in browsers that do not implement the entire
-* firebug console suit
-*
-*/
-(function(window) {
-  window.console || (window.console = {});
-
-  var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
-  "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
-
-  function emptyFunction(){}
-
-  for (var i = 0; i < names.length; ++i){
-    window.console[names[i]] || (window.console[names[i]] = emptyFunction);
-    if (typeof window.console[names[i]] !== 'function')
-      window.console[names[i]] = (function(method) {
-          return function(){ return Function.prototype.apply.apply(method, [console,arguments]); };
-        })(window.console[names[i]]);
-  }
-})(this);

spec/runner.html

@@ -29,7 +29,6 @@
   <script type="text/javascript" src="../src/WaitsForBlock.js"></script>
 
   <script type="text/javascript" src="../src/html/TrivialReporter.js"></script>
-  <script type="text/javascript" src="../lib/consolex.js"></script>