git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for #1198
[jquery.git]
/
src
/
ajax
/
ajax.js
diff --git
a/src/ajax/ajax.js
b/src/ajax/ajax.js
index
e97fa07
..
102c7f9
100644
(file)
--- a/
src/ajax/ajax.js
+++ b/
src/ajax/ajax.js
@@
-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
/**
@@
-287,6
+281,7
@@
jQuery.extend({
}
return jQuery.ajax({
}
return jQuery.ajax({
+ type: "GET",
url: url,
data: data,
success: callback,
url: url,
data: data,
success: callback,
@@
-413,11
+408,8
@@
jQuery.extend({
});
},
});
},
- // timeout (ms)
- //timeout: 0,
-
/**
/**
- * Set the timeout of all AJAX requests to a specific amount of time.
+ * Set the timeout in milliseconds of all AJAX requests to a specific amount of time.
* This will make all future AJAX requests timeout after a specified amount
* of time.
*
* This will make all future AJAX requests timeout after a specified amount
* of time.
*
@@
-433,7
+425,7
@@
jQuery.extend({
*
* @name $.ajaxTimeout
* @type undefined
*
* @name $.ajaxTimeout
* @type undefined
- * @param Number time How long before an AJAX request times out.
+ * @param Number time How long before an AJAX request times out, in milliseconds.
* @cat Ajax
*/
ajaxTimeout: function( timeout ) {
* @cat Ajax
*/
ajaxTimeout: function( timeout ) {
@@
-519,7
+511,7
@@
jQuery.extend({
* response has changed since the last request. This is done by checking the
* Last-Modified header. Default value is false, ignoring the header.
*
* response has changed since the last request. This is done by checking the
* Last-Modified header. Default value is false, ignoring the header.
*
- * (Number) timeout - Local timeout to override global timeout, eg. to give a
+ * (Number) timeout - Local timeout in milliseconds to override global timeout, eg. to give a
* single request a longer timeout while all others timeout after 1 second.
* See $.ajaxTimeout() for global timeouts.
*
* single request a longer timeout while all others timeout after 1 second.
* See $.ajaxTimeout() for global timeouts.
*
@@
-623,8
+615,9
@@
jQuery.extend({
var requestDone = false;
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);
// Open the socket
xml.open(s.type, s.url, s.async);
@@
-641,10
+634,6
@@
jQuery.extend({
// Set header so the called script knows that it's an XMLHttpRequest
xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
// Set header so the called script knows that it's an XMLHttpRequest
xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
- // Make sure the browser sends the right content length
- if ( xml.overrideMimeType )
- xml.setRequestHeader("Connection", "close");
-
// Allow custom headers/mimetypes
if( s.beforeSend )
s.beforeSend(xml);
// Allow custom headers/mimetypes
if( s.beforeSend )
s.beforeSend(xml);