diff options
| author | Igor Minar | 2012-01-09 10:36:51 -0800 |
|---|---|---|
| committer | Vojta Jina | 2012-01-09 14:38:32 -0800 |
| commit | 7146f7063602b82383211533d98e78f7eb2c03db (patch) | |
| tree | d222b0dcd6f0a34fc51195b358da5f97190797ac /src | |
| parent | 11cb9423a7a68ea65fee09241179fa04a5cb2eec (diff) | |
| download | angular.js-7146f7063602b82383211533d98e78f7eb2c03db.tar.bz2 | |
fix($httpBackend): fix for jsonp requests
Diffstat (limited to 'src')
| -rw-r--r-- | src/angular-mocks.js | 4 | ||||
| -rw-r--r-- | src/service/httpBackend.js | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/angular-mocks.js b/src/angular-mocks.js index 4b462a87..cc7f63a8 100644 --- a/src/angular-mocks.js +++ b/src/angular-mocks.js @@ -147,8 +147,8 @@ angular.module.ngMock.$Browser = function() { }; self.$$scripts = []; - self.addJs = function(url, domId, done) { - var script = {url: url, id: domId, done: done}; + self.addJs = function(url, done) { + var script = {url: url, done: done}; self.$$scripts.push(script); return script; }; diff --git a/src/service/httpBackend.js b/src/service/httpBackend.js index 6da32600..f18808c6 100644 --- a/src/service/httpBackend.js +++ b/src/service/httpBackend.js @@ -38,7 +38,8 @@ function createHttpBackend($browser, XHR, $browserDefer, callbacks, body, locati callbacks[callbackId].data = data; }; - var script = $browser.addJs(url.replace('JSON_CALLBACK', callbackId), null, function() { + var script = $browser.addJs(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId), + function() { if (callbacks[callbackId].data) { completeRequest(callback, 200, callbacks[callbackId].data); } else { |