Changeset 5605

Timestamp:

05/15/08 14:16:19 (8 months ago)

Author:

aflesler

Message:

jquery ajax: caching repetive conversions/checks for settings.type in $.ajax.

Files:

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

trunk/jquery/src/ajax.js

@@ -166 +166 @@
 
     ajax: function( s ) {
-        var jsonp, jsre = /=\?(&|$)/g, status, data;
-
         // Extend the settings, but re-extend 's' so that it can be
         // checked again later (in the test suite, specifically)
         s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
 
+        var jsonp, jsre = /=\?(&|$)/g, status, data,
+            type = s.type.toUpperCase();
+
         // convert data if not already a string
         if ( s.data && s.processData && typeof s.data != "string" )
@@ -178 +179 @@
         // Handle JSONP Parameter Callbacks
         if ( s.dataType == "jsonp" ) {
-            if ( s.type.toLowerCase() == "get" ) {
+            if ( type == "GET" ) {
                 if ( !s.url.match(jsre) )
                     s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
@@ -215 +216 @@
             s.cache = false;
 
-        if ( s.cache === false && s.type.toLowerCase() == "get" ) {
+        if ( s.cache === false && type == "GET" ) {
             var ts = now();
             // try replacing _= if it is there
@@ -224 +225 @@
 
         // If data is available, append data to url for get requests
-        if ( s.data && s.type.toLowerCase() == "get" ) {
+        if ( s.data && type == "GET" ) {
             s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
 
@@ -240 +241 @@
         // If we're requesting a remote document
         // and trying to load JSON or Script with a GET
-        if ( s.dataType == "script" && s.type.toLowerCase() == "get"
+        if ( s.dataType == "script" && type == "GET"
                 && remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
             var head = document.getElementsByTagName("head")[0];
@@ -279 +280 @@
         // Passing null username, generates a login popup on Opera (#2865)
         if( s.username )
-            xml.open(s.type, s.url, s.async, s.username, s.password);
+            xml.open(type, s.url, s.async, s.username, s.password);
         else
-            xml.open(s.type, s.url, s.async);
+            xml.open(type, s.url, s.async);
 
         // Need an extra try/catch for cross domain requests in Firefox 3