Make sure that when multiple variables are being declared that assignments are each...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 6a757eb..9195bcc 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -208,12 +208,6 @@ jQuery.extend({
                        s.data = jQuery.param( s.data, s.traditional );
                }
 
-               // If the jsonpCallback has been set, we can assume that dataType is jsonp
-               // Ticket #5803
-               if ( s.jsonpCallback ) {
-                 s.dataType = "jsonp";
-               }
-
                // Handle JSONP Parameter Callbacks
                if ( s.dataType === "jsonp" ) {
                        if ( type === "GET" ) {
@@ -293,7 +287,7 @@ jQuery.extend({
 
                // Matches an absolute URL, and saves the domain
                var parts = rurl.exec( s.url ),
-                       remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+                       remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host);
 
                // If we're requesting a remote document
                // and trying to load JSON or Script with a GET
@@ -512,11 +506,12 @@ jQuery.extend({
        // Serialize an array of form elements or a set of
        // key/values into a query string
        param: function( a, traditional ) {
-               var s = [], add = function( key, value ) {
-                       // If value is a function, invoke it and return its value
-                       value = jQuery.isFunction(value) ? value() : value;
-                       s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
-               };
+               var s = [],
+                       add = function( key, value ) {
+                               // If value is a function, invoke it and return its value
+                               value = jQuery.isFunction(value) ? value() : value;
+                               s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+                       };
                
                // Set traditional to true for jQuery <= 1.3.2 behavior.
                if ( traditional === undefined ) {