diff options
| author | Vojta Jina | 2011-08-03 13:53:59 +0200 |
|---|---|---|
| committer | Igor Minar | 2011-11-30 11:03:41 -0500 |
| commit | 0c8b35681e2ea9ce3ee6a188476f89be1336f1cb (patch) | |
| tree | d5fdb8a5ba6a8c1fe05bd409f5c2102b53a49855 /src | |
| parent | a035e8839730ee19dfdabbb9c85d39ea16566f09 (diff) | |
| download | angular.js-0c8b35681e2ea9ce3ee6a188476f89be1336f1cb.tar.bz2 | |
feat($browser): xhr returns raw request object
Diffstat (limited to 'src')
| -rw-r--r-- | src/angular-mocks.js | 1 | ||||
| -rw-r--r-- | src/service/browser.js | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/angular-mocks.js b/src/angular-mocks.js index f5907a42..73bc4cbd 100644 --- a/src/angular-mocks.js +++ b/src/angular-mocks.js @@ -120,6 +120,7 @@ angular.module.ngMock.$Browser = function() { }); callback(expectation.code, expectation.response); }); + // TODO(vojta): return mock request object }; self.xhr.expectations = expectations; self.xhr.requests = requests; diff --git a/src/service/browser.js b/src/service/browser.js index 2e2c07e8..da82b9b0 100644 --- a/src/service/browser.js +++ b/src/service/browser.js @@ -90,8 +90,12 @@ function Browser(window, document, body, XHR, $log, $sniffer) { * <li><tt>X-Requested-With</tt>: <tt>XMLHttpRequest</tt></li> * </ul> * + * @returns {XMLHttpRequest|undefined} Raw XMLHttpRequest object or undefined when JSONP method + * * @description * Send ajax request + * + * TODO(vojta): change signature of this method to (method, url, data, headers, callback) */ self.xhr = function(method, url, post, callback, headers) { outstandingRequestCount ++; @@ -124,6 +128,7 @@ function Browser(window, document, body, XHR, $log, $sniffer) { } }; xhr.send(post || ''); + return xhr; } }; |
