git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed .removeAttr(Function), it didn't really make sense.
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
b5adf2c
..
9501e8a
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-555,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" ) {
@@
-571,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))();
}
}