jquery ajax: closes #3231. The ajax setting 'dataFilter' can also par…

…se the response.
jquery · Aug 7, 2008 · bf6f7e7 · bf6f7e7
1 parent 9d9c4d2
commit bf6f7e7
Showing 1 changed file with 10 additions and 6 deletions.
diff --git 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;
 	},