git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8ceedb
)
jquery ajax: extends #3087. The xhr factory is now an ajax setting called 'xhr' inste...
author
Ariel Flesler
<aflesler@gmail.com>
Thu, 7 Aug 2008 13:07:21 +0000
(13:07 +0000)
committer
Ariel Flesler
<aflesler@gmail.com>
Thu, 7 Aug 2008 13:07:21 +0000
(13:07 +0000)
src/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
441a7b9
..
a5ee4b7
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-113,13
+113,6
@@
jQuery.extend({
dataType: type
});
},
dataType: type
});
},
-
- // Create the request object; Microsoft failed to properly
- // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
- getAjaxTransport : function() {
- return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
- },
-
getScript: function( url, callback ) {
return jQuery.get(url, null, callback, "script");
getScript: function( url, callback ) {
return jQuery.get(url, null, callback, "script");
@@
-159,6
+152,12
@@
jQuery.extend({
data: null,
username: null,
password: null,
data: null,
username: null,
password: null,
+ // Create the request object; Microsoft failed to properly
+ // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+ // This function can be overriden by calling jQuery.ajaxSetup
+ xhr:function(){
+ return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+ },
accepts: {
xml: "application/xml, text/xml",
html: "text/html",
accepts: {
xml: "application/xml, text/xml",
html: "text/html",
@@
-282,7
+281,7
@@
jQuery.extend({
var requestDone = false;
// Create the request object
var requestDone = false;
// Create the request object
- var xhr = jQuery.getAjaxTransport();
+ var xhr = s.xhr();
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)