Remove Backbone.resolveDeferred. Closes gh-40.

Author: paulmillr

lib/dom-utils.js

@@ -44,7 +44,7 @@ utils.ajax = (function() {
       (xhr.status === 0 && window.location.protocol === 'file:')
   };
 
-  var end = function(xhr, options, promise) {
+  var end = function(xhr, options, deferred) {
     return function() {
       if (xhr.readyState !== 4) return;
 
@@ -54,12 +54,11 @@ utils.ajax = (function() {
       // Check for validity.
       if (isValid(xhr)) {
         if (options.success) options.success(data);
-        if (promise) Backbone.resolveDeferred(promise, true, [data, xhr]);
+        if (deferred) deferred.resolve(data);
       } else {
         var error = new Error('Server responded with a status of ' + status);
-        error.code = status;
         if (options.error) options.error(xhr, status, error);
-        if (promise) Backbone.resolveDeferred(promise, false, [xhr]);
+        if (deferred) deferred.reject(xhr);
       }
     }
   };
@@ -69,14 +68,16 @@ utils.ajax = (function() {
     if (options.method == null) options.method = 'GET';
 
     var xhr = new XMLHttpRequest();
-    var promise = Backbone.Deferred && Backbone.Deferred();
+    var deferred = Backbone.Deferred && Backbone.Deferred();
+
     if (options.credentials) options.withCredentials = true;
-    xhr.addEventListener('readystatechange', end(xhr, options, promise));
+    xhr.addEventListener('readystatechange', end(xhr, options, deferred));
     xhr.open(options.method, options.url, true);
     if (options.headers) for (var key in options.headers) {
       xhr.setRequestHeader(key, options.headers[key]);
     }
     xhr.send(options.data);
-    return promise;
+
+    return deferred ? deferred.promise : undefined;
   };
 })();

lib/sync.js

@@ -83,10 +83,6 @@ Backbone.ajax = Backbone.$ ? function() {
   return Backbone.$.ajax.apply(Backbone.$, arguments);
 } : utils.ajax;
 
-Backbone.Deferred = Backbone.$ ? function() {
+if (Backbone.$) Backbone.Deferred = function() {
   return new Backbone.$.Deferred();
-} : null;
-
-Backbone.resolveDeferred = function(deferred, isResolved, args) {
-  return null;
 };