Skip to content
Permalink
Browse files
Remove XMLHttpRequest shadowing, instead decide at runtime whether to…
… create an ActiveXObject or the XMLHttpRequest, potentially fixing #963
  • Loading branch information
jzaefferer committed Apr 3, 2007
1 parent 14fa1e8 commit bfe5f891068af9f86d7be288ad0da7b442427d9c
Showing with 8 additions and 8 deletions.
  1. +5 −0 ChangeLog.txt
  2. +3 −8 src/ajax/ajax.js
@@ -2,6 +2,11 @@

== 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 ===

* Event handlers (like element.onclick) are now removed when no more functions are bound to the event.
@@ -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

/**
@@ -624,8 +618,9 @@ jQuery.extend({

var requestDone = false;

// Create the request object
var xml = new XMLHttpRequest();
// Create the request object; Microsoft failed to properly
// 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
xml.open(s.type, s.url, s.async);

0 comments on commit bfe5f89

Please sign in to comment.