aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2011-07-11 21:52:27 -0700
committerIgor Minar2011-07-13 16:21:08 -0700
commitc52e749a6eaec80a1229c59d7f938ec729f5ec8c (patch)
tree758ebe2cc8bce0edf5e61b7c4d39d462f89b79c8
parent4ab359629548b777a69cfdb989a0249806696163 (diff)
downloadangular.js-c52e749a6eaec80a1229c59d7f938ec729f5ec8c.tar.bz2
fix($browser.xhr): properly delete jsonp callbacks
-rw-r--r--src/Browser.js2
-rw-r--r--test/BrowserSpecs.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Browser.js b/src/Browser.js
index 37fb4931..d6b2b8d0 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -92,7 +92,7 @@ function Browser(window, document, body, XHR, $log) {
var script = jqLite(rawDocument.createElement('script'))
.attr({type: 'text/javascript', src: url.replace('JSON_CALLBACK', callbackId)});
window[callbackId] = function(data){
- window[callbackId] = undefined;
+ delete window[callbackId];
script.remove();
completeOutstandingRequest(callback, 200, data);
};
diff --git a/test/BrowserSpecs.js b/test/BrowserSpecs.js
index cb59137e..96839a1c 100644
--- a/test/BrowserSpecs.js
+++ b/test/BrowserSpecs.js
@@ -96,7 +96,7 @@ describe('browser', function(){
fakeWindow[url[1]]('data');
expect(callback).toHaveBeenCalled();
expect(log).toEqual('remove();200:data;');
- expect(typeof fakeWindow[url[1]]).toEqual('undefined');
+ expect(fakeWindow[url[1]]).toBeUndefined();
});
});