git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that we aren't reading one of the bad expandos. Fixes #7212.
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
1602ed2
..
a40e223
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-239,10
+239,6
@@
jQuery.extend({
var customJsonp = window[ jsonp ];
window[ jsonp ] = function( tmp ) {
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 );
if ( jQuery.isFunction( customJsonp ) ) {
customJsonp( tmp );
@@
-254,6
+250,10
@@
jQuery.extend({
delete window[ jsonp ];
} catch( jsonpError ) {}
}
delete window[ jsonp ];
} catch( jsonpError ) {}
}
+
+ data = tmp;
+ jQuery.handleSuccess( s, xhr, status, data );
+ jQuery.handleComplete( s, xhr, status, data );
if ( head ) {
head.removeChild( script );
if ( head ) {
head.removeChild( script );