Commit 497fc984 authored by John Resig's avatar John Resig

Bringing back the change from 80a4178a,...

Bringing back the change from 80a4178a, adapted to handle both the function collision and the issue mentioned in #7196.
parent 091c481a
...@@ -239,10 +239,6 @@ jQuery.extend({ ...@@ -239,10 +239,6 @@ jQuery.extend({
var customJsonp = window[ jsonp ]; var customJsonp = window[ jsonp ];
window[ jsonp ] = function( tmp ) { window[ jsonp ] = function( tmp ) {
data = tmp;
jQuery.handleSuccess( s, xhr, status, data );
jQuery.handleComplete( s, xhr, status, data );
if ( jQuery.isFunction( customJsonp ) ) { if ( jQuery.isFunction( customJsonp ) ) {
customJsonp( tmp ); customJsonp( tmp );
...@@ -255,6 +251,10 @@ jQuery.extend({ ...@@ -255,6 +251,10 @@ jQuery.extend({
} catch( jsonpError ) {} } catch( jsonpError ) {}
} }
data = tmp;
jQuery.handleSuccess( s, xhr, status, data );
jQuery.handleComplete( s, xhr, status, data );
if ( head ) { if ( head ) {
head.removeChild( script ); head.removeChild( script );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment