httpBulk service

angularFiles.js

@@ -12,6 +12,7 @@ angularFiles = {
     'src/jqLite.js',
     'src/apis.js',
     'src/filters.js',
+    'src/service/cacheFactory.js',
     'src/service/cookieStore.js',
     'src/service/cookies.js',
     'src/service/defer.js',
@@ -25,10 +26,9 @@ angularFiles = {
     'src/service/routeParams.js',
     'src/service/sniffer.js',
     'src/service/window.js',
-    'src/service/xhr.bulk.js',
-    'src/service/xhr.cache.js',
-    'src/service/xhr.error.js',
-    'src/service/xhr.js',
+    'src/service/http.js',
+    'src/service/httpBackend.js',
+    'src/service/httpBulk.js',
     'src/service/locale.js',
     'src/directives.js',
     'src/markups.js',

docs/content/cookbook/buzz.ngdoc

@@ -18,8 +18,8 @@ to retrieve Buzz activity and comments.
      this.Activity = $resource(
       'https://www.googleapis.com/buzz/v1/activities/:userId/:visibility/:activityId/:comments',
       {alt: 'json', callback: 'JSON_CALLBACK'},
-      { get:     {method: 'JSON', params: {visibility: '@self'}},
-        replies: {method: 'JSON', params: {visibility: '@self', comments: '@comments'}}
+      { get:     {method: 'JSONP', params: {visibility: '@self'}},
+        replies: {method: 'JSONP', params: {visibility: '@self', comments: '@comments'}}
       });
     }
     BuzzController.prototype = {

src/AngularPublic.js

@@ -5,7 +5,7 @@ var browserSingleton;
 angularService('$browser', function($log, $sniffer) {
   if (!browserSingleton) {
     browserSingleton = new Browser(window, jqLite(window.document), jqLite(window.document.body),
-                                   XHR, $log, $sniffer);
+                                   $log, $sniffer);
   }
   return browserSingleton;
 }, {$inject: ['$log', '$sniffer']});

src/Browser.js

@@ -1,16 +1,5 @@
 'use strict';
 
-//////////////////////////////
-// Browser
-//////////////////////////////
-var XHR = window.XMLHttpRequest || function() {
-  try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e1) {}
-  try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch (e2) {}
-  try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (e3) {}
-  throw new Error("This browser does not support XMLHttpRequest.");
-};
-
-
 /**
  * @ngdoc service
  * @name angular.service.$browser
@@ -36,7 +25,7 @@ var XHR = window.XMLHttpRequest || function() {
  * @param {object} $log console.log or an object with the same interface.
  * @param {object} $sniffer $sniffer service
  */
-function Browser(window, document, body, XHR, $log, $sniffer) {
+function Browser(window, document, body, $log, $sniffer) {
   var self = this,
       rawDocument = document[0],
       location = window.location,
@@ -47,13 +36,12 @@ function Browser(window, document, body, XHR, $log, $sniffer) {
 
   self.isMock = false;
 
-  //////////////////////////////////////////////////////////////
-  // XHR API
-  //////////////////////////////////////////////////////////////
-  var idCounter = 0;
   var outstandingRequestCount = 0;
   var outstandingRequestCallbacks = [];
 
+  // TODO(vojta): remove this temporary api
+  self.$$completeOutstandingRequest = completeOutstandingRequest;
+  self.$$incOutstandingRequestCount = function() { outstandingRequestCount++; };
 
   /**
    * Executes the `fn` function(supports currying) and decrements the `outstandingRequestCallbacks`
@@ -76,60 +64,6 @@ function Browser(window, document, body, XHR, $log, $sniffer) {
     }
   }
 
-  /**
-   * @ngdoc method
-   * @name angular.service.$browser#xhr
-   * @methodOf angular.service.$browser
-   *
-   * @param {string} method Requested method (get|post|put|delete|head|json)
-   * @param {string} url Requested url
-   * @param {?string} post Post data to send (null if nothing to post)
-   * @param {function(number, string)} callback Function that will be called on response
-   * @param {object=} header additional HTTP headers to send with XHR.
-   *   Standard headers are:
-   *   <ul>
-   *     <li><tt>Content-Type</tt>: <tt>application/x-www-form-urlencoded</tt></li>
-   *     <li><tt>Accept</tt>: <tt>application/json, text/plain, &#42;/&#42;</tt></li>
-   *     <li><tt>X-Requested-With</tt>: <tt>XMLHttpRequest</tt></li>
-   *   </ul>
-   *
-   * @description
-   * Send ajax request
-   */
-  self.xhr = function(method, url, post, callback, headers) {
-    outstandingRequestCount ++;
-    if (lowercase(method) == 'json') {
-      var callbackId = ("angular_" + Math.random() + '_' + (idCounter++)).replace(/\d\./, '');
-      window[callbackId] = function(data) {
-        window[callbackId].data = data;
-      };
-
-      var script = self.addJs(url.replace('JSON_CALLBACK', callbackId), function() {
-        if (window[callbackId].data) {
-          completeOutstandingRequest(callback, 200, window[callbackId].data);
-        } else {
-          completeOutstandingRequest(callback);
-        }
-        delete window[callbackId];
-        body[0].removeChild(script);
-      });
-    } else {
-      var xhr = new XHR();
-      xhr.open(method, url, true);
-      forEach(headers, function(value, key) {
-          if (value) xhr.setRequestHeader(key, value);
-      });
-      xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-          // normalize IE bug (http://bugs.jquery.com/ticket/1450)
-          var status = xhr.status == 1223 ? 204 : xhr.status;
-          completeOutstandingRequest(callback, status, xhr.responseText);
-        }
-      };
-      xhr.send(post || '');
-    }
-  };
-
   /**
    * @private
    * Note: this method is used only by scenario runner

src/Resource.js

@@ -36,8 +36,8 @@ Route.prototype = {
   }
 };
 
-function ResourceFactory(xhr) {
-  this.xhr = xhr;
+function ResourceFactory($http) {
+  this.$http = $http;
 }
 
 ResourceFactory.DEFAULT_ACTIONS = {
@@ -107,11 +107,11 @@ ResourceFactory.prototype = {
         }
 
         var value = this instanceof Resource ? this : (action.isArray ? [] : new Resource(data));
-        self.xhr(
-          action.method,
-          route.url(extend({}, extractParams(data), action.params || {}, params)),
-          data,
-          function(status, response) {
+        var future = self.$http({
+          method: action.method,
+          url: route.url(extend({}, extractParams(data), action.params || {}, params)),
+          data: data
+        }).on('success', function(response, status) {
             if (response) {
               if (action.isArray) {
                 value.length = 0;
@@ -123,9 +123,10 @@ ResourceFactory.prototype = {
               }
             }
             (success||noop)(value);
-          },
-          error || action.verifyCache,
-          action.verifyCache);
+          });
+
+        if (error) future.on('error', error);
+
         return value;
       };