aboutsummaryrefslogtreecommitdiffstats
path: root/src/ajax.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/ajax.js')
-rw-r--r--src/ajax.js16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/ajax.js b/src/ajax.js
index a5ee4b7cc..885c8193e 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -480,14 +480,18 @@ jQuery.extend({
if( s && s.dataFilter )
data = s.dataFilter( data, type );
- // If the type is "script", eval it in global context
- if ( type == "script" )
- jQuery.globalEval( data );
+ // The filter can actually parse the response
+ if( typeof data == 'string' ){
- // Get the JavaScript object, if JSON is used.
- if ( type == "json" )
- data = eval("(" + data + ")");
+ // If the type is "script", eval it in global context
+ if ( type == "script" )
+ jQuery.globalEval( data );
+ // Get the JavaScript object, if JSON is used.
+ if ( type == "json" )
+ data = eval("(" + data + ")");
+ }
+
return data;
},