Changeset 5811

Timestamp:

08/07/08 20:41:05 (3 weeks ago)

Author:

aflesler

Message:

jquery ajax: closes #3231. The ajax setting 'dataFilter' can also parse the response.

Files:

• trunk/jquery/src/ajax.js (modified) (1 diff)

trunk/jquery/src/ajax.js

@@ -481 +481 @@
             data = s.dataFilter( data, type );
 
-        // 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 + ")");
-
+        // The filter can actually parse the response
+        if( typeof data == 'string' ){
+
+            // 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;
     },