From 04bd18e38e2d18ab5dc5f1b8f9bf9056e4e7f943 Mon Sep 17 00:00:00 2001
From: Brad Dunbar <dunbarb2@gmail.com>
Date: Tue, 15 May 2012 17:45:36 -0400
Subject: [PATCH] Jettison setDomLibrary in favor of Backbone.$.

---
 backbone.js           | 27 ++++++-----------
 index.html            | 67 +++++++++++++++++++------------------------
 test/setdomlibrary.js | 31 --------------------
 test/test.html        |  1 -
 4 files changed, 38 insertions(+), 88 deletions(-)
 delete mode 100644 test/setdomlibrary.js

diff --git a/backbone.js b/backbone.js
index bab8a7fd..383ecdd7 100644
--- a/backbone.js
+++ b/backbone.js
@@ -38,16 +38,7 @@
   if (!_ && (typeof require !== 'undefined')) _ = require('underscore');
 
   // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
-  var $ = root.jQuery || root.Zepto || root.ender;
-
-  // Set the JavaScript library that will be used for DOM manipulation and
-  // Ajax calls (a.k.a. the `$` variable). By default Backbone will use: jQuery,
-  // Zepto, or Ender; but the `setDomLibrary()` method lets you inject an
-  // alternate JavaScript library (or a mock library for testing your views
-  // outside of a browser).
-  Backbone.setDomLibrary = function(lib) {
-    $ = lib;
-  };
+  Backbone.$ = root.jQuery || root.Zepto || root.ender;
 
   // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
   // to its previous owner. Returns a reference to this Backbone object.
@@ -1017,16 +1008,16 @@
       var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
 
       if (oldIE && this._wantsHashChange) {
-        this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
+        this.iframe = Backbone.$('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
         this.navigate(fragment);
       }
 
       // Depending on whether we're using pushState or hashes, and whether
       // 'onhashchange' is supported, determine how we check the URL state.
       if (this._hasPushState) {
-        $(window).bind('popstate', this.checkUrl);
+        Backbone.$(window).bind('popstate', this.checkUrl);
       } else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) {
-        $(window).bind('hashchange', this.checkUrl);
+        Backbone.$(window).bind('hashchange', this.checkUrl);
       } else if (this._wantsHashChange) {
         this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
       }
@@ -1060,7 +1051,7 @@
     // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
     // but possibly useful for unit testing Routers.
     stop: function() {
-      $(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
+      Backbone.$(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
       clearInterval(this._checkUrlInterval);
       History.started = false;
     },
@@ -1201,8 +1192,8 @@
     //
     make: function(tagName, attributes, content) {
       var el = document.createElement(tagName);
-      if (attributes) $(el).attr(attributes);
-      if (content != null) $(el).html(content);
+      if (attributes) Backbone.$(el).attr(attributes);
+      if (content != null) Backbone.$(el).html(content);
       return el;
     },
 
@@ -1210,7 +1201,7 @@
     // re-delegation.
     setElement: function(element, delegate) {
       if (this.$el) this.undelegateEvents();
-      this.$el = (element instanceof $) ? element : $(element);
+      this.$el = element instanceof Backbone.$ ? element : Backbone.$(element);
       this.el = this.$el[0];
       if (delegate !== false) this.delegateEvents();
       return this;
@@ -1371,7 +1362,7 @@
 
   // Set the default implementation of `Backbone.ajax` to proxy through to `$`.
   Backbone.ajax = function() {
-    return $.ajax.apply($, arguments);
+    return Backbone.$.ajax.apply(Backbone.$, arguments);
   };
 
   // Wrap an optional error callback with a fallback error event.
diff --git a/index.html b/index.html
index dcbcbb83..7de087fe 100644
--- a/index.html
+++ b/index.html
@@ -343,7 +343,6 @@
     </a>
     <ul class="toc_section">
       <li>– <a href="#Utility-noConflict">noConflict</a></li>
-      <li>– <a href="#Utility-setDomLibrary">setDomLibrary</a></li>
     </ul>
 
     <a class="toc_title" href="#examples">
@@ -1654,7 +1653,7 @@ var Tweets = Backbone.Collection.extend({
       <br />
       Returns a new instance of the collection with an identical list of models.
     </p>
-    
+
     <p id="Collection-fetch">
       <b class="header">fetch</b><code>collection.fetch([options])</code>
       <br />
@@ -2391,14 +2390,6 @@ var localBackbone = Backbone.noConflict();
 var model = localBackbone.Model.extend(...);
 </pre>
 
-    <p id="Utility-setDomLibrary">
-      <b class="header">setDomLibrary</b><code>Backbone.setDomLibrary(jQueryNew);</code>
-      <br />
-      If you have multiple copies of <tt>jQuery</tt> on the page, or simply want
-      to tell Backbone to use a particular object as its DOM / Ajax library,
-      this is the function for you.
-    </p>
-
     <h2 id="examples">Examples</h2>
 
     <p>
@@ -2447,15 +2438,15 @@ var model = localBackbone.Model.extend(...);
     <h2 id="examples-rdio">Rdio</h2>
 
     <p>
-      <a href="http://rdio.com/new">New Rdio</a> was developed from the ground 
-      up with a component based framework based on Backbone.js. Every component 
-      on the screen is dynamically loaded and rendered, with data provided by the 
-      <a href="http://developer.rdio.com/">Rdio API</a>. When changes are pushed, 
-      every component can update itself without reloading the page or interrupting 
-      the user's music. All of this relies on Backbone's views and models, 
-      and all URL routing is handled by Backbone's Router. When data changes are 
-      signaled in realtime, Backbone's Events notify the interested components 
-      in the data changes. Backbone forms the core of the new, dynamic, realtime 
+      <a href="http://rdio.com/new">New Rdio</a> was developed from the ground
+      up with a component based framework based on Backbone.js. Every component
+      on the screen is dynamically loaded and rendered, with data provided by the
+      <a href="http://developer.rdio.com/">Rdio API</a>. When changes are pushed,
+      every component can update itself without reloading the page or interrupting
+      the user's music. All of this relies on Backbone's views and models,
+      and all URL routing is handled by Backbone's Router. When data changes are
+      signaled in realtime, Backbone's Events notify the interested components
+      in the data changes. Backbone forms the core of the new, dynamic, realtime
       Rdio web and <i>desktop</i> applications.
     </p>
 
@@ -2475,7 +2466,7 @@ var model = localBackbone.Model.extend(...);
       The app also uses <a href="http://zeptojs.com/">Zepto</a>,
       <a href="http://underscorejs.org/">Underscore.js</a>,
       <a href="http://sass-lang.com/">SASS</a>, <a href="http://cubiq.org/iscroll">iScroll</a>,
-      HTML5 LocalStorage and Canvas. The tech team blogged about 
+      HTML5 LocalStorage and Canvas. The tech team blogged about
       <a href="https://engineering.linkedin.com/mobile/linkedin-ipad-using-local-storage-snappy-mobile-apps">their experiences using LocalStorage</a>
       to improve mobile performance.
     </p>
@@ -2593,15 +2584,15 @@ var model = localBackbone.Model.extend(...);
         <img src="docs/images/do.png" alt="Do" class="example_image" />
       </a>
     </div>
-    
+
     <h2 id="examples-pitchfork">Pitchfork</h2>
 
     <p>
-      <a href="http://pitchfork.com/">Pitchfork</a> uses Backbone.js to power 
-      its site-wide audio player, <a href="http://pitchfork.com/tv/">Pitchfork.tv</a>, 
-      location routing, a write-thru page fragment cache, and more. Backbone.js 
-      (and <a href="http://underscorejs.org/">Underscore.js</a>) helps the team 
-      create clean and modular components, 
+      <a href="http://pitchfork.com/">Pitchfork</a> uses Backbone.js to power
+      its site-wide audio player, <a href="http://pitchfork.com/tv/">Pitchfork.tv</a>,
+      location routing, a write-thru page fragment cache, and more. Backbone.js
+      (and <a href="http://underscorejs.org/">Underscore.js</a>) helps the team
+      create clean and modular components,
       move very quickly, and focus on the site, not the spaghetti.
     </p>
 
@@ -2610,7 +2601,7 @@ var model = localBackbone.Model.extend(...);
         <img src="docs/images/pitchfork.png" alt="Pitchfork" class="example_image" />
       </a>
     </div>
-    
+
     <h2 id="examples-walmart">Walmart Mobile</h2>
 
     <p>
@@ -2874,15 +2865,15 @@ var model = localBackbone.Model.extend(...);
         <img src="docs/images/grove.png" alt="Grove.io" class="example_image" />
       </a>
     </div>
-    
+
     <h2 id="examples-kanogames">KANO/GAMES</h2>
 
     <p>
-      <a href="http://www.kanoapps.com/">KANO/APPS</a> used Backbone.js to create 
-      <a href="http://www.kanogames.com/">KANO/GAMES</a>, a social gaming website. 
-      KANO/GAMES relies on Backbone.js for almost every aspect of the site: 
-      for seamless page loading, to construct menus, game listings and game 
-      canvases, to build interactive HTML5 avatars, and for 
+      <a href="http://www.kanoapps.com/">KANO/APPS</a> used Backbone.js to create
+      <a href="http://www.kanogames.com/">KANO/GAMES</a>, a social gaming website.
+      KANO/GAMES relies on Backbone.js for almost every aspect of the site:
+      for seamless page loading, to construct menus, game listings and game
+      canvases, to build interactive HTML5 avatars, and for
       user and developer profiles, and live feeds.
     </p>
 
@@ -2910,14 +2901,14 @@ var model = localBackbone.Model.extend(...);
         <img src="docs/images/shortmail.png" alt="Shortmail" class="example_image" />
       </a>
     </div>
-    
+
     <h2 id="examples-scrollkit">scroll kit</h2>
 
     <p>
-      <a href="http://scrollkit.com/">scroll kit</a> is a new kind of website 
-      builder that makes designing a web page feel more like drawing. 
-      The workspace is a single-page web application built with Rails and Backbone.js. 
-      In scroll kit, every DOM element is associated with a Backbone model, so that 
+      <a href="http://scrollkit.com/">scroll kit</a> is a new kind of website
+      builder that makes designing a web page feel more like drawing.
+      The workspace is a single-page web application built with Rails and Backbone.js.
+      In scroll kit, every DOM element is associated with a Backbone model, so that
       style changes that are made to an element automatically update the model
       and propagate the change across all its views.
       <a href="http://scrollkit.com/demo">Try it out</a>.
diff --git a/test/setdomlibrary.js b/test/setdomlibrary.js
deleted file mode 100644
index b9efe504..00000000
--- a/test/setdomlibrary.js
+++ /dev/null
@@ -1,31 +0,0 @@
-$(document).ready(function(jQuery) {
-
-  // a mock object that looks sufficiently jQuery-ish
-  var myLib = function() {
-    return {
-      attr: function() { return "spam" },
-      html: function() { return "spam" },
-      hasClass: function() { return "spam" }
-    };
-  };
-
-  var viewAttrs = { id: 'test-setdomlibrary', className: 'test-setdomlibrary' }
-
-  module("Backbone.setDomLibrary", {
-
-    teardown: function() {
-      Backbone.setDomLibrary(jQuery);
-    }
-
-  });
-
-  test('Changing jQuery library to custom library', function() {
-    Backbone.setDomLibrary(myLib);
-    var view = new Backbone.View(viewAttrs);
-    ok(view.$el.hasClass('test-setdomlibrary') === 'spam');
-    Backbone.setDomLibrary(jQuery);
-    var view = new Backbone.View(viewAttrs);
-    ok(view.$el.hasClass('test-setdomlibrary'));
-  });
-
-});
diff --git a/test/test.html b/test/test.html
index f828a449..6f70c74b 100644
--- a/test/test.html
+++ b/test/test.html
@@ -19,7 +19,6 @@
   <script src="view.js"></script>
   <script src="sync.js"></script>
   <script src="speed.js"></script>
-  <script src="setdomlibrary.js"></script>
 </head>
 <body>
   <div id="qunit"></div>