deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove XMLHttpRequest shadowing, instead decide at runtime whether to create an ActiveXObject or the XMLHttpRequest, potentially fixing #963

Browse source
This commit is contained in:
Jörn Zaefferer 2007-04-03 21:19:54 +00:00
parent 14fa1e858c
commit bfe5f89106
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog.txt
View file

@ -2,6 +2,11 @@
== 1.2 == == 1.2 ==
=== 1.1.3 ===
* Always create an ActiveXObject when it is available instead of the XMLHttpRequest, even in IE7
* Removed XMLHttpRequest shadowing, may break code that relies on existence of that function for browser checking
* ...
=== 1.1.2 === === 1.1.2 ===
* Event handlers (like element.onclick) are now removed when no more functions are bound to the event. * Event handlers (like element.onclick) are now removed when no more functions are bound to the event.

11
src/ajax/ajax.js
View file

@ -132,12 +132,6 @@ jQuery.fn.extend({
}); });
// If IE is used, create a wrapper for the XMLHttpRequest object
if ( !window.XMLHttpRequest )
XMLHttpRequest = function(){
return new ActiveXObject("Microsoft.XMLHTTP");
};
// Attach a bunch of functions for handling common AJAX events // Attach a bunch of functions for handling common AJAX events
/** /**
@ -624,8 +618,9 @@ jQuery.extend({
var requestDone = false; var requestDone = false;
// Create the request object // Create the request object; Microsoft failed to properly
var xml = new XMLHttpRequest(); // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
// Open the socket // Open the socket
xml.open(s.type, s.url, s.async); xml.open(s.type, s.url, s.async);