Bringing back the change from 80a4178, adapted to handle both the fun…

…ction collision and the issue mentioned in #7196.
Karunakar · Oct 15, 2010 · 497fc98 · 497fc98
1 parent 091c481
commit 497fc98
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/ajax.js b/src/ajax.js
@@ -239,10 +239,6 @@ jQuery.extend({
 			var customJsonp = window[ jsonp ];
 
 			window[ jsonp ] = function( tmp ) {
-				data = tmp;
-				jQuery.handleSuccess( s, xhr, status, data );
-				jQuery.handleComplete( s, xhr, status, data );
-
 				if ( jQuery.isFunction( customJsonp ) ) {
 					customJsonp( tmp );
 
@@ -254,6 +250,10 @@ jQuery.extend({
 						delete window[ jsonp ];
 					} catch( jsonpError ) {}
 				}
+
+				data = tmp;
+				jQuery.handleSuccess( s, xhr, status, data );
+				jQuery.handleComplete( s, xhr, status, data );
 
 				if ( head ) {
 					head.removeChild( script );