git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing some bugs in the re-tooling of toggleClass, adding in some performance optimiz...
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
2249dc6
..
9501e8a
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-175,12
+175,18
@@
jQuery.extend({
traditional: false,
*/
// Create the request object; Microsoft failed to properly
traditional: false,
*/
// Create the request object; Microsoft failed to properly
- // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+ // implement the XMLHttpRequest in IE7 (can't request local files),
+ // so we use the ActiveXObject when it is available
// This function can be overriden by calling jQuery.ajaxSetup
xhr: function() {
// This function can be overriden by calling jQuery.ajaxSetup
xhr: function() {
- return window.ActiveXObject ?
- new ActiveXObject("Microsoft.XMLHTTP") :
- new XMLHttpRequest();
+ if ( window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ) {
+ return new window.XMLHttpRequest();
+
+ } else {
+ try {
+ return new window.ActiveXObject("Microsoft.XMLHTTP");
+ } catch(e) {}
+ }
},
accepts: {
xml: "application/xml, text/xml",
},
accepts: {
xml: "application/xml, text/xml",
@@
-325,6
+331,10
@@
jQuery.extend({
// Create the request object
var xhr = s.xhr();
// Create the request object
var xhr = s.xhr();
+ if ( !xhr ) {
+ return;
+ }
+
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
if ( s.username ) {
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
if ( s.username ) {
@@
-384,7
+394,7
@@
jQuery.extend({
// The request was aborted, clear the interval and decrement jQuery.active
if ( !xhr || xhr.readyState === 0 ) {
requestDone = true;
// The request was aborted, clear the interval and decrement jQuery.active
if ( !xhr || xhr.readyState === 0 ) {
requestDone = true;
- xhr.onreadystatechange = function(){};
+ xhr.onreadystatechange = jQuery.noop;
// Handle the global AJAX counter
if ( s.global && ! --jQuery.active ) {
// Handle the global AJAX counter
if ( s.global && ! --jQuery.active ) {
@@
-394,7
+404,7
@@
jQuery.extend({
// The transfer is complete and the data is available, or the request timed out
} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
requestDone = true;
// The transfer is complete and the data is available, or the request timed out
} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
requestDone = true;
- xhr.onreadystatechange = function(){};
+ xhr.onreadystatechange = jQuery.noop;
status = isTimeout === "timeout" ?
"timeout" :
status = isTimeout === "timeout" ?
"timeout" :
@@
-545,8
+555,8
@@
jQuery.extend({
},
httpData: function( xhr, type, s ) {
},
httpData: function( xhr, type, s ) {
- var ct = xhr.getResponseHeader("content-type"),
- xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0,
+ var ct = xhr.getResponseHeader("content-type") || "",
+ xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
data = xml ? xhr.responseXML : xhr.responseText;
if ( xml && data.documentElement.nodeName === "parsererror" ) {
data = xml ? xhr.responseXML : xhr.responseText;
if ( xml && data.documentElement.nodeName === "parsererror" ) {
@@
-561,17
+571,18
@@
jQuery.extend({
// The filter can actually parse the response
if ( typeof data === "string" ) {
// The filter can actually parse the response
if ( typeof data === "string" ) {
-
// If the type is "script", eval it in global context
// If the type is "script", eval it in global context
- if ( type === "script" ) {
+ if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
jQuery.globalEval( data );
}
// Get the JavaScript object, if JSON is used.
jQuery.globalEval( data );
}
// Get the JavaScript object, if JSON is used.
- if ( type === "json" ) {
- if ( typeof JSON === "object" && JSON.parse ) {
+ if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+ // Try to use the native JSON parser first
+ try {
data = JSON.parse( data );
data = JSON.parse( data );
- } else {
+
+ } catch(e) {
data = (new Function("return " + data))();
}
}
data = (new Function("return " + data))();
}
}