Changeset 2420

Timestamp:

07/20/07 19:33:44 (1 year ago)

Author:

jeresig

Message:

The isTimeout fix from #970 was causing unintended status bugs (fixed). This also includes a fix for errors that occurred during an empty eval in IE (but #1410).

Files:

• trunk/jquery/src/ajax/ajax.js (modified) (2 diffs)

trunk/jquery/src/ajax/ajax.js

@@ -656 +656 @@
                 var status;
                 try {
-                    status = isTimeout || (jQuery.httpSuccess( xml ) ?
-                        s.ifModified && jQuery.httpNotModified( xml, s.url ) ? "notmodified" : "success" : "error");
+                    status = isTimeout == "timeout" && "timeout" ||
+                                    !jQuery.httpSuccess( xml ) && "error" ||
+                                    s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
+                                    "success";
                     // Make sure that the request was successful or notmodified
                     if ( status != "error" && status != "timeout" ) {
@@ -827 +829 @@
     // not reliable for safari
     globalEval: function( data ) {
-        if ( window.execScript )
-            window.execScript( data );
-        else if ( jQuery.browser.safari )
-            // safari doesn't provide a synchronous global eval
-            window.setTimeout( data, 0 );
-        else
-            eval.call( window, data );
+        data = jQuery.trim( data );
+        if ( data ) {
+            if ( window.execScript )
+                window.execScript( data );
+            else if ( jQuery.browser.safari )
+                // safari doesn't provide a synchronous global eval
+                window.setTimeout( data, 0 );
+            else
+                eval.call( window, data );
+        }
     }