aboutsummaryrefslogtreecommitdiffstats
path: root/src/ajax.js
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2010-10-14 20:55:40 -0400
committerjeresig <jeresig@gmail.com>2010-10-14 20:55:40 -0400
commit80a4178af9b12e6617bfcec818c538dfe08d3791 (patch)
tree99977e9f1bd4f6aa5bacc3238ac6c1ea16aeff9c /src/ajax.js
parent8576570e6e5f2ebd95c49a66848f066dcf99d673 (diff)
downloadjquery-80a4178af9b12e6617bfcec818c538dfe08d3791.tar.gz
jquery-80a4178af9b12e6617bfcec818c538dfe08d3791.zip
Reverting commit 39addc87a37b32be19f2c58ec8babe752c0243e1 after a report of problems. Fixes #7196.
Diffstat (limited to 'src/ajax.js')
-rw-r--r--src/ajax.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ajax.js b/src/ajax.js
index 5c8ec62ab..1602ed25a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -239,6 +239,10 @@ 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,10 +258,6 @@ jQuery.extend({
if ( head ) {
head.removeChild( script );
}
-
- data = tmp;
- jQuery.handleSuccess( s, xhr, status, data );
- jQuery.handleComplete( s, xhr, status, data );
};
}