deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bringing back the change from 80a4178af9, adapted to handle both the function collision and the issue mentioned in #7196.

Browse source
This commit is contained in:
John Resig 2010-10-15 01:29:38 -04:00
parent 091c481aca
commit 497fc9849e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ajax.js
View file

@ -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 );
} }