mirror of
https://github.com/jquery/jquery.git
synced 2024-10-05 11:34:18 +00:00
Bringing back the change from 80a4178af9
, adapted to handle both the function collision and the issue mentioned in #7196.
This commit is contained in:
parent
091c481aca
commit
497fc9849e
@ -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({
|
|||||||
} 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 );
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user