mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-17 07:40:22 +00:00
fix($httpBackend): only IE8 and below can't use script.onload for JSONP
IE8, IE9 and IE10 can use `script.onreadystate` so up till now we have been using this if the sniffer says we are on IE. But IE11 now does not support `script.onreadystate` and only supports the more standard `script.onload` and `script.onerror`. IE9 and IE10 do support `script.onload` and `script.onerror`. So now we only test whether we are on IE8 or earlier before using `script.onreadystate`. See http://pieisgood.org/test/script-link-events/ jQuery just uses all these handlers at once and hopes for the best, but since IE9 and IE10 support both sets of handlers, this could cause the handlers to be run more than once. jQuery also notes that there is a potential memory leak in IE unless we remove the handlers from the script object once they are run. So we are doing this too, now. Closes #4523 Closes #4527 Closes #4922
This commit is contained in:
parent
84c408ce63
commit
a3172a285f
2 changed files with 43 additions and 6 deletions
|
|
@ -136,6 +136,7 @@ function createHttpBackend($browser, XHR, $browserDefer, callbacks, rawDocument,
|
|||
// - adds and immediately removes script elements from the document
|
||||
var script = rawDocument.createElement('script'),
|
||||
doneWrapper = function() {
|
||||
script.onreadystatechange = script.onload = script.onerror = null;
|
||||
rawDocument.body.removeChild(script);
|
||||
if (done) done();
|
||||
};
|
||||
|
|
@ -143,12 +144,16 @@ function createHttpBackend($browser, XHR, $browserDefer, callbacks, rawDocument,
|
|||
script.type = 'text/javascript';
|
||||
script.src = url;
|
||||
|
||||
if (msie) {
|
||||
if (msie && msie <= 8) {
|
||||
script.onreadystatechange = function() {
|
||||
if (/loaded|complete/.test(script.readyState)) doneWrapper();
|
||||
if (/loaded|complete/.test(script.readyState)) {
|
||||
doneWrapper();
|
||||
}
|
||||
};
|
||||
} else {
|
||||
script.onload = script.onerror = doneWrapper;
|
||||
script.onload = script.onerror = function() {
|
||||
doneWrapper();
|
||||
};
|
||||
}
|
||||
|
||||
rawDocument.body.appendChild(script);
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ describe('$httpBackend', function() {
|
|||
script.readyState = 'complete';
|
||||
script.onreadystatechange();
|
||||
} else {
|
||||
script.onload()
|
||||
script.onload();
|
||||
}
|
||||
|
||||
expect(callback).toHaveBeenCalledOnce();
|
||||
|
|
@ -313,7 +313,7 @@ describe('$httpBackend', function() {
|
|||
script.readyState = 'complete';
|
||||
script.onreadystatechange();
|
||||
} else {
|
||||
script.onload()
|
||||
script.onload();
|
||||
}
|
||||
|
||||
expect(callbacks[callbackId]).toBeUndefined();
|
||||
|
|
@ -321,6 +321,38 @@ describe('$httpBackend', function() {
|
|||
});
|
||||
|
||||
|
||||
if(msie<=8) {
|
||||
|
||||
it('should attach onreadystatechange handler to the script object', function() {
|
||||
$backend('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, noop);
|
||||
|
||||
expect(fakeDocument.$$scripts[0].onreadystatechange).toEqual(jasmine.any(Function));
|
||||
|
||||
var script = fakeDocument.$$scripts[0];
|
||||
|
||||
script.readyState = 'complete';
|
||||
script.onreadystatechange();
|
||||
|
||||
expect(script.onreadystatechange).toBe(null);
|
||||
});
|
||||
|
||||
} else {
|
||||
|
||||
it('should attach onload and onerror handlers to the script object', function() {
|
||||
$backend('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, noop);
|
||||
|
||||
expect(fakeDocument.$$scripts[0].onload).toEqual(jasmine.any(Function));
|
||||
expect(fakeDocument.$$scripts[0].onerror).toEqual(jasmine.any(Function));
|
||||
|
||||
var script = fakeDocument.$$scripts[0];
|
||||
script.onload();
|
||||
|
||||
expect(script.onload).toBe(null);
|
||||
expect(script.onerror).toBe(null);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
it('should call callback with status -2 when script fails to load', function() {
|
||||
callback.andCallFake(function(status, response) {
|
||||
expect(status).toBe(-2);
|
||||
|
|
@ -335,7 +367,7 @@ describe('$httpBackend', function() {
|
|||
script.readyState = 'complete';
|
||||
script.onreadystatechange();
|
||||
} else {
|
||||
script.onload()
|
||||
script.onload();
|
||||
}
|
||||
expect(callback).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue