Fixes jashkenas#841, adding upgrading jquery, classname --> class in …

…the docs.
whump · Jan 12, 2012 · 4719659 · 4719659
1 parent 1d90bb9
commit 4719659
Show file tree

Hide file tree

Showing 4 changed files with 1,720 additions and 1,500 deletions.
diff --git a/examples/todos/index.html b/examples/todos/index.html
@@ -5,7 +5,7 @@
     <title>Backbone Demo: Todos</title>
     <link href="todos.css" media="all" rel="stylesheet" type="text/css"/>
     <script src="../../test/vendor/json2.js"></script>
-    <script src="../../test/vendor/jquery-1.6.4.js"></script>
+    <script src="../../test/vendor/jquery-1.7.1.js"></script>
     <script src="../../test/vendor/underscore-1.2.4.js"></script>
     <script src="../../backbone.js"></script>
     <script src="../backbone-localstorage.js"></script>

diff --git a/index.html b/index.html
@@ -687,15 +687,15 @@ <h2 id="Model">Backbone.Model</h2>
       Models can be retrieved by id from collections, and the id is used to generate
       model URLs by default.
     </p>
-    
+
     <p id="Model-idAttribute">
       <b class="header">idAttribute</b><code>model.idAttribute</code>
       <br />
       A model's unique identifier is stored under the <tt>id</tt> attribute.
       If you're directly communicating with a backend (CouchDB, MongoDB) that uses
-      a different unique key, you may set a Model's <tt>idAttribute</tt> to 
-      transparently map from that key to <tt>id</tt>. 
-      
+      a different unique key, you may set a Model's <tt>idAttribute</tt> to
+      transparently map from that key to <tt>id</tt>.
+
 <pre class="runnable">
 var Meal = Backbone.Model.extend({
   idAttribute: "_id"
@@ -705,7 +705,7 @@ <h2 id="Model">Backbone.Model</h2>
 alert("Cake id: " + cake.id);
 </pre>
     </p>
-    
+
     <p id="Model-cid">
       <b class="header">cid</b><code>model.cid</code>
       <br />
@@ -1486,10 +1486,10 @@ <h2 id="Router">Backbone.Router</h2>
     <p id="Router-extend">
       <b class="header">extend</b><code>Backbone.Router.extend(properties, [classProperties])</code>
       <br />
-      Get started by creating a custom router class. Define actions that are 
+      Get started by creating a custom router class. Define actions that are
       triggered when certain URL fragments are
       matched, and provide a <a href="#Router-routes">routes</a> hash
-      that pairs routes to actions. Note that you'll want to avoid using a 
+      that pairs routes to actions. Note that you'll want to avoid using a
       leading slash in your route definitions:
     </p>
 
@@ -1949,7 +1949,7 @@ <h2 id="View">Backbone.View</h2>
 <pre class="runnable">
 var view = new Backbone.View;
 
-var el = view.make("b", {className: "bold"}, "Bold! ");
+var el = view.make("b", {"class": "bold"}, "Bold! ");
 
 $("#make-demo").append(el);
 </pre>
@@ -2165,16 +2165,16 @@ <h2 id="examples-do">Do</h2>
         <img src="docs/images/do.png" alt="Do" class="example_image" />
       </a>
     </div>
-    
+
     <h2 id="examples-posterous">Posterous</h2>
 
     <p>
-      <a href="https://posterous.com/">Posterous Spaces</a> is 
-      <a href="http://technology.posterous.com/posterous-spaces-is-built-on-backbonejs">built on Backbone</a>. 
+      <a href="https://posterous.com/">Posterous Spaces</a> is
+      <a href="http://technology.posterous.com/posterous-spaces-is-built-on-backbonejs">built on Backbone</a>.
       The models and collections mirror the public
-      <a href="http://posterous.com/api">Posterous API</a>. Backbone made it easy 
-      for the team to create a JavaScript-heavy application with complex 
-      interactions and state maintenance. Spaces also uses CoffeeScript, 
+      <a href="http://posterous.com/api">Posterous API</a>. Backbone made it easy
+      for the team to create a JavaScript-heavy application with complex
+      interactions and state maintenance. Spaces also uses CoffeeScript,
       Underscore.js, Haml.js, Sass, Compass, and of course jQuery.
     </p>
 
@@ -2242,12 +2242,12 @@ <h2 id="examples-slavery-footprint">Slavery Footprint</h2>
         <img src="docs/images/slavery-footprint.png" alt="Slavery Footprint" class="example_image" />
       </a>
     </div>
-    
+
     <h2 id="examples-diaspora">Diaspora</h2>
 
     <p>
       <a href="http://www.joindiaspora.com/">Diaspora</a> is a distributed social
-      network, formed from a number of independently operated <i>pods</i>. 
+      network, formed from a number of independently operated <i>pods</i>.
       You own your personal data, and control with whom you share.
       All of Diaspora is <a href="https://github.com/diaspora/diaspora">open-source</a>
       code, built with Rails and Backbone.js.
@@ -2579,16 +2579,16 @@ <h2 id="examples-bittorrent">BitTorrent</h2>
         <img src="docs/images/bittorrent.jpg" alt="BitTorrent" class="example_image" />
       </a>
     </div>
-    
+
     <h2 id="examples-picplum">Picplum</h2>
 
     <p>
-      <a href="https://www.picplum.com/">Picplum</a> makes it easy to 
-      automatically send high quality photo prints to 
-      your close family and friends. The entire app is built in Backbone.js 
-      using Handlebars.js templates. 
-      <a href="http://pusher.com/">Pusher</a> enables real-time 
-      uploading that makes the photo import process fast and reactive. 
+      <a href="https://www.picplum.com/">Picplum</a> makes it easy to
+      automatically send high quality photo prints to
+      your close family and friends. The entire app is built in Backbone.js
+      using Handlebars.js templates.
+      <a href="http://pusher.com/">Pusher</a> enables real-time
+      uploading that makes the photo import process fast and reactive.
     </p>
 
     <div style="text-align: center;">
@@ -3015,7 +3015,7 @@ <h2 id="changelog">Change Log</h2>
   </div>
 
   <script src="test/vendor/underscore-1.2.4.js"></script>
-  <script src="test/vendor/jquery-1.6.4.js"></script>
+  <script src="test/vendor/jquery-1.7.1.js"></script>
   <script src="test/vendor/json2.js"></script>
   <script src="backbone.js"></script>
 

diff --git a/test/test.html b/test/test.html
@@ -4,7 +4,7 @@
   <title>Backbone Test Suite</title>
   <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
   <script type="text/javascript" src="vendor/json2.js"></script>
-  <script type="text/javascript" src="vendor/jquery-1.6.4.js"></script>
+  <script type="text/javascript" src="vendor/jquery-1.7.1.js"></script>
   <script type="text/javascript" src="vendor/qunit.js"></script>
   <script type="text/javascript">
     QUnit.config.reorder = false;