Skip to content
Permalink
Browse files

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

…ction collision and the issue mentioned in #7196.
  • Loading branch information...
jeresig committed Oct 15, 2010
1 parent 091c481 commit 497fc9849e91ba8602adf7908b4febf2d36bc1c8
Showing with 4 additions and 4 deletions.
  1. +4 −4 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 );

0 comments on commit 497fc98

Please sign in to comment.
You can’t perform that action at this time.