Stores jQuery.ajaxSettings.isLocal locally at load time so that any change to it...

diff --git a/src/ajax.js b/src/ajax.js
index 4b3ab76..2c61cf2 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -15,7 +15,7 @@ var r20 = /%20/g,
        rselectTextarea = /^(?:select|textarea)/i,
        rspacesAjax = /\s+/,
        rts = /([?&])_=[^&]*/,
-       rurl = /^(\w+:)\/\/([^\/?#:]+)(?::(\d+))?/,
+       rurl = /^(\w+:)\/\/([^\/?#:]*)(?::(\d+))?/,
 
        // Keep a copy of the old load method
        _load = jQuery.fn.load,

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 4adf8eb..97db079 100644 (file)
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -1,5 +1,18 @@
 (function( jQuery ) {
 
+// Functions to create xhrs
+function createStandardXHR() {
+       try {
+               return new window.XMLHttpRequest();
+       } catch( e ) {}
+}
+
+function createActiveXHR() {
+       try {
+               return new window.ActiveXObject("Microsoft.XMLHTTP");
+       } catch( e ) {}
+}
+
 var // Next active xhr id
        xhrId = jQuery.now(),
 
@@ -10,7 +23,11 @@ var // Next active xhr id
        xhrUnloadAbortInstalled,
 
        // XHR used to determine supports properties
-       testXHR;
+       testXHR,
+
+       // Keep track of isLocal in case it gets removed
+       // from ajaxSettings later on
+       protocolIsLocal = jQuery.ajaxSettings.isLocal;
 
 // Create the request object
 // (This is still attached to ajaxSettings for backward compatibility)
@@ -21,28 +38,17 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ?
         * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
         * we need a fallback.
         */
-       function() {
-               if ( !jQuery.ajaxSettings.isLocal ) {
-                       try {
-                               return new window.XMLHttpRequest();
-                       } catch( xhrError ) {}
+       ( protocolIsLocal ?
+               createActiveXHR :
+               function() {
+                       return createStandardXHR() || createActiveXHR();
                }
-
-               try {
-                       return new window.ActiveXObject("Microsoft.XMLHTTP");
-               } catch( activeError ) {}
-       } :
+       ) :
        // For all other browsers, use the standard XMLHttpRequest object
-       function() {
-               return new window.XMLHttpRequest();
-       };
+       createStandardXHR;
 
 // Test if we can create an xhr object
-try {
-       testXHR = jQuery.ajaxSettings.xhr();
-} catch( xhrCreationException ) {}
-
-//Does this browser support XHR requests?
+testXHR = jQuery.ajaxSettings.xhr();
 jQuery.support.ajax = !!testXHR;
 
 // Does this browser support crossDomain XHR requests
@@ -189,13 +195,14 @@ if ( jQuery.support.ajax ) {
                                                                                                // for errors, could be anything really (even a real 0)
                                                                                                status = 302;
                                                                                        }
-                                                                               // All same-domain - #8125, #8152: for local files, 0 is a success
-                                                                               } else if( s.isLocal ) {
+                                                                               // All same-domain: for local files, 0 is a success
+                                                                               } else if( protocolIsLocal ) {
                                                                                        status = 200;
+                                                                                       // Opera: this notifies success for all requests
+                                                                                       // (verified in 11.01). Patch welcome.
                                                                                }
                                                                                // Opera - #6060: sets status as 0 for 304
-                                                                               // and there doesn't seem to be any way to
-                                                                               // detect this case. Patch VERY welcome.
+                                                                               // Patch welcome.
                                                                        }
                                                                }
                                                        }

diff --git a/test/localfile.html b/test/localfile.html
index 8021631..b354612 100644 (file)
--- a/test/localfile.html
+++ b/test/localfile.html
@@ -25,16 +25,32 @@
 </head>
 
 <body>
+       <h1>jQuery Local File Test</h1>
+       <ul>
+               <li>
+                       Access this file using the "file:" protocol.
+               </li>
+               <li>
+                       Two lines must appear below.
+               </li>
+               <li>
+                       Opera will fail at detecting errors, it's a known issue.
+               </li>
+       </ul>
        <script>
-       jQuery.ajax( "data/badjson.js" , {
-               dataType: "text"
-       }).success(function() {
-               $( "<div/>" ).text( "Success OK" ).appendTo( "body" );
-       });
-       jQuery.ajax( "data/doesnotexist.ext" , {
-               dataType: "text"
-       }).error(function() {
-               $( "<div/>" ).text( "Error OK" ).appendTo( "body" );
-       });
+               jQuery.ajax( "data/badjson.js" , {
+                       dataType: "text"
+               }).success(function() {
+                       jQuery( "<div/>" ).text( "Success OK" ).appendTo( "body" );
+               });
+               jQuery.ajax( "data/doesnotexist.ext" , {
+                       dataType: "text"
+               }).error(function() {
+                       jQuery( "<div/>" ).text( "Error OK" ).appendTo( "body" );
+               }).success(function() {
+                       if ( jQuery.browser.opera ) {
+                               jQuery( "<div/>" ).text( "Error Fail (Opera)" ).appendTo( "body" );
+                       }
+               });
        </script>
 </body>
\ No newline at end of file