Make sure that Opera fires events after an aborted Ajax attempt. Fixes #5787.

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 73e1db6..07e706c 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -393,7 +393,9 @@ jQuery.extend({
                        // The request was aborted, clear the interval and decrement jQuery.active
                        if ( !xhr || xhr.readyState === 0 ) {
                                requestDone = true;
-                               xhr.onreadystatechange = jQuery.noop;
+                               if ( xhr ) {
+                                       xhr.onreadystatechange = jQuery.noop;
+                               }
 
                                // Handle the global AJAX counter
                                if ( s.global && ! --jQuery.active ) {
@@ -447,6 +449,22 @@ jQuery.extend({
                        }
                };
 
+               // Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+               // Opera doesn't fire onreadystatechange at all on abort
+               try {
+                       var oldAbort = xhr.abort;
+                       xhr.abort = function() {
+                               oldAbort.call( xhr );
+                               if ( xhr ) {
+                                       xhr.readyState = 0;
+                               }
+                               if ( !requestDone ) {
+                                       complete();
+                               }
+                               onreadystatechange();
+                       };
+               } catch(e) { }
+
                // Timeout checker
                if ( s.async && s.timeout > 0 ) {
                        setTimeout(function() {
@@ -572,19 +590,22 @@ jQuery.extend({
                if ( typeof data === "string" ) {
                        // Get the JavaScript object, if JSON is used.
                        if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-                               // Try to use the native JSON parser first
-                               if ( window.JSON && window.JSON.parse ) {
-                                       data = window.JSON.parse( data );
-
                                // Make sure the incoming data is actual JSON
                                // Logic borrowed from http://json.org/json2.js
-                               } else if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+                               if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
                                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
                                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+
+                                       // Try to use the native JSON parser first
+                                       if ( window.JSON && window.JSON.parse ) {
+                                               data = window.JSON.parse( data );
+
+                                       } else {
                                                data = (new Function("return " + data))();
+                                       }
 
                                } else {
-                                       throw "JSON.parse";
+                                       throw "Invalid JSON: " + data;
                                }
 
                        // If the type is "script", eval it in global context