Created
October 4, 2008 21:55
-
-
Save austinfromboston/14809 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- | |
public/javascripts/jquery/jquery-1.2.6.js | 6 +++++- | |
1 files changed, 5 insertions(+), 1 deletions(-) | |
diff --git a/public/javascripts/jquery/jquery-1.2.6.js b/public/javascripts/jquery/jquery-1.2.6.js | |
index 88e661e..5db150d 100644 | |
--- a/public/javascripts/jquery/jquery-1.2.6.js | |
+++ b/public/javascripts/jquery/jquery-1.2.6.js | |
@@ -2566,6 +2566,9 @@ jQuery.extend({ | |
data: null, | |
username: null, | |
password: null, | |
+ xhr: function() { | |
+ return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); | |
+ }, | |
accepts: { | |
xml: "application/xml, text/xml", | |
html: "text/html", | |
@@ -2689,7 +2692,8 @@ jQuery.extend({ | |
// Create the request object; Microsoft failed to properly | |
// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available | |
- var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); | |
+ //var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); | |
+ var xhr = s.xhr(); | |
// Open the socket | |
// Passing null username, generates a login popup on Opera (#2865) | |
-- | |
1.5.3.7 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment