]> source.dussan.org Git - jquery.git/commitdiff
Tweak spacing from last commit.
authorjeresig <jeresig@gmail.com>
Tue, 15 Jun 2010 03:05:01 +0000 (23:05 -0400)
committerjeresig <jeresig@gmail.com>
Tue, 15 Jun 2010 03:05:01 +0000 (23:05 -0400)
speed/benchmarker.css [changed mode: 0644->0755]
speed/benchmarker.js [changed mode: 0644->0755]
speed/index.html [changed mode: 0644->0755]
src/ajax.js

old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
index ffd870c284e854aa710a9f7dcf53672209919d4b..47f243e55a4492f0126835a602b627132e45cf27 100644 (file)
@@ -238,23 +238,24 @@ jQuery.extend({
 
                        // Handle JSONP-style loading
                        var customJsonp = window[ jsonp ];
+
                        window[ jsonp ] = function( tmp ) {
                                data = tmp;
                                jQuery.ajax.handleSuccess( s, xhr, status, data );
                                jQuery.ajax.handleComplete( s, xhr, status, data );
                                
                                if ( jQuery.isFunction( customJsonp ) ) {
-                                   customJsonp( tmp );
-                           }
-                           else {
-                               // Garbage collect
-                               window[ jsonp ] = undefined;
-
-                               try {
-                                       delete window[ jsonp ];
-                               } catch( jsonpError ) {}
-                }
-                
+                                       customJsonp( tmp );
+
+                               } else {
+                                       // Garbage collect
+                                       window[ jsonp ] = undefined;
+
+                                       try {
+                                               delete window[ jsonp ];
+                                       } catch( jsonpError ) {}
+                               }
+                               
                                if ( head ) {
                                        head.removeChild( script );
                                }
@@ -444,8 +445,9 @@ jQuery.extend({
 
                                // Fire the complete handlers
                                if ( !jsonp ) {
-                                   jQuery.ajax.handleComplete( s, xhr, status, data );
-                }
+                                       jQuery.ajax.handleComplete( s, xhr, status, data );
+                               }
+
                                if ( isTimeout === "timeout" ) {
                                        xhr.abort();
                                }