X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=src%2Fajax%2Fajax.js;h=66519036dace5c8d33059b777f380aaffd31ad00;hb=2b82ffbbfac419e017acea3e0f83c063549e545e;hp=2e222d4539b9405371cbd48099f192e9a4f731b9;hpb=ccc4c7663a117f4a9c5469f086d18133ae4f2e38;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 2e222d4..6651903 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -11,9 +11,9 @@ jQuery.fn.extend({ * @name loadIfModified * @type jQuery * @param String url The URL of the HTML file to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded (parameters: responseText, status and response itself). - * @cat AJAX + * @cat Ajax */ loadIfModified: function( url, params, callback ) { this.load( url, params, callback, 1 ); @@ -23,6 +23,7 @@ jQuery.fn.extend({ * Load HTML from a remote file and inject it into the DOM. * * Note: Avoid to use this to load scripts, instead use $.getScript. + * IE strips script tags when there aren't any other characters in front of it. * * @example $("#feeds").load("feeds.html"); * @before
@@ -40,10 +41,10 @@ jQuery.fn.extend({ * @param String url The URL of the HTML file to load. * @param Object params (optional) A set of key/value pairs that will be sent as data to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded (parameters: responseText, status and response itself). - * @cat AJAX + * @cat Ajax */ load: function( url, params, callback, ifModified ) { - if ( url.constructor == Function ) + if ( jQuery.isFunction( url ) ) return this.bind("load", url); callback = callback || function(){}; @@ -52,9 +53,9 @@ jQuery.fn.extend({ var type = "GET"; // If the second parameter was provided - if ( params ) { + if ( params ) // If it's a function - if ( params.constructor == Function ) { + if ( jQuery.isFunction( params.constructor ) ) { // We assume that it's the callback callback = params; params = null; @@ -64,7 +65,6 @@ jQuery.fn.extend({ params = jQuery.param( params ); type = "POST"; } - } var self = this; @@ -75,14 +75,14 @@ jQuery.fn.extend({ data: params, ifModified: ifModified, complete: function(res, status){ - if ( status == "success" || !ifModified && status == "notmodified" ) { + if ( status == "success" || !ifModified && status == "notmodified" ) // Inject the HTML into all the matched elements self.html(res.responseText) // Execute all the scripts inside of the newly-injected HTML .evalScripts() // Execute callback .each( callback, [res.responseText, status, res] ); - } else + else callback.apply( self, [res.responseText, status, res] ); } }); @@ -105,7 +105,7 @@ jQuery.fn.extend({ * * @name serialize * @type String - * @cat AJAX + * @cat Ajax */ serialize: function() { return jQuery.param( this ); @@ -118,15 +118,14 @@ jQuery.fn.extend({ * @name evalScripts * @type jQuery * @private - * @cat AJAX + * @cat Ajax */ evalScripts: function() { - return this.find('script').each(function(){ + return this.find("script").each(function(){ if ( this.src ) jQuery.getScript( this.src ); - else { + else jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" ); - } }).end(); } @@ -153,7 +152,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @name ajaxStart * @type jQuery * @param Function callback The function to execute. - * @cat AJAX + * @cat Ajax */ /** @@ -167,7 +166,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @name ajaxStop * @type jQuery * @param Function callback The function to execute. - * @cat AJAX + * @cat Ajax */ /** @@ -184,7 +183,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @name ajaxComplete * @type jQuery * @param Function callback The function to execute. - * @cat AJAX + * @cat Ajax */ /** @@ -202,7 +201,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @name ajaxSuccess * @type jQuery * @param Function callback The function to execute. - * @cat AJAX + * @cat Ajax */ /** @@ -220,7 +219,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @name ajaxError * @type jQuery * @param Function callback The function to execute. - * @cat AJAX + * @cat Ajax */ /** @@ -237,19 +236,13 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @name ajaxSend * @type jQuery * @param Function callback The function to execute. - * @cat AJAX + * @cat Ajax */ - -new function(){ - var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","); - - for ( var i = 0; i < e.length; i++ ) new function(){ - var o = e[i]; - jQuery.fn[o] = function(f){ - return this.bind(o, f); - }; +jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){ + jQuery.fn[o] = function(f){ + return this.bind(o, f); }; -}; +}); jQuery.extend({ @@ -274,16 +267,17 @@ jQuery.extend({ * @name $.get * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded. - * @cat AJAX + * @cat Ajax */ get: function( url, data, callback, type, ifModified ) { // shift arguments if data argument was ommited - if ( data && data.constructor == Function ) { + if ( jQuery.isFunction( data ) ) { callback = data; data = null; } + return jQuery.ajax({ url: url, data: data, @@ -315,9 +309,9 @@ jQuery.extend({ * @name $.getIfModified * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded. - * @cat AJAX + * @cat Ajax */ getIfModified: function( url, data, callback, type ) { return jQuery.get(url, data, callback, type, 1); @@ -340,7 +334,7 @@ jQuery.extend({ * @type XMLHttpRequest * @param String url The URL of the page to load. * @param Function callback (optional) A function to be executed whenever the data is loaded. - * @cat AJAX + * @cat Ajax */ getScript: function( url, callback ) { return jQuery.get(url, null, callback, "script"); @@ -363,9 +357,9 @@ jQuery.extend({ * @name $.getJSON * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback A function to be executed whenever the data is loaded. - * @cat AJAX + * @cat Ajax */ getJSON: function( url, data, callback ) { return jQuery.get(url, data, callback, "json"); @@ -392,9 +386,9 @@ jQuery.extend({ * @name $.post * @type XMLHttpRequest * @param String url The URL of the page to load. - * @param Hash params (optional) A set of key/value pairs that will be sent to the server. + * @param Map params (optional) Key/value pairs that will be sent to the server. * @param Function callback (optional) A function to be executed whenever the data is loaded. - * @cat AJAX + * @cat Ajax */ post: function( url, data, callback, type ) { return jQuery.ajax({ @@ -407,7 +401,7 @@ jQuery.extend({ }, // timeout (ms) - timeout: 0, + //timeout: 0, /** * Set the timeout of all AJAX requests to a specific amount of time. @@ -419,18 +413,53 @@ jQuery.extend({ * You can manually abort requests with the XMLHttpRequest's (returned by * all ajax functions) abort() method. * + * Deprecated. Use $.ajaxSetup instead. + * * @example $.ajaxTimeout( 5000 ); * @desc Make all AJAX requests timeout after 5 seconds. * * @name $.ajaxTimeout * @type undefined * @param Number time How long before an AJAX request times out. - * @cat AJAX + * @cat Ajax + */ + ajaxTimeout: function( timeout ) { + jQuery.ajaxSettings.timeout = timeout; + }, + + /** + * Setup global settings for AJAX requests. + * + * See $.ajax for a description of all available options. + * + * @example $.ajaxSetup( { + * url: "/xmlhttp/", + * global: false, + * type: "POST" + * } ); + * $.ajax({ data: myData }); + * @desc Sets the defaults for AJAX requests to the url "/xmlhttp/", + * disables global handlers and uses POST instead of GET. The following + * AJAX requests then sends some data without having to set anything else. + * + * @name $.ajaxSetup + * @type undefined + * @param Map settings Key/value pairs to use for all AJAX requests + * @cat Ajax */ - ajaxTimeout: function(timeout) { - jQuery.timeout = timeout; + ajaxSetup: function( settings ) { + jQuery.extend( jQuery.ajaxSettings, settings ); }, + ajaxSettings: { + global: true, + type: "GET", + timeout: 0, + contentType: "application/x-www-form-urlencoded", + processData: true, + async: true + }, + // Last-Modified header cache for next request lastModified: {}, @@ -550,32 +579,18 @@ jQuery.extend({ * * @name $.ajax * @type XMLHttpRequest - * @param Hash prop A set of properties to initialize the request with. - * @cat AJAX + * @param Map properties Key/value pairs to initialize the request with. + * @cat Ajax + * @see ajaxSetup(Map) */ ajax: function( s ) { // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout - s = jQuery.extend({ - global: true, - ifModified: false, - type: "GET", - timeout: jQuery.timeout, - complete: null, - success: null, - error: null, - dataType: null, - url: null, - data: null, - contentType: "application/x-www-form-urlencoded", - processData: true, - async: true, - beforeSend: null - }, s); + s = jQuery.extend({}, jQuery.ajaxSettings, s); // if data available if ( s.data ) { // convert data if not already a string - if (s.processData && typeof s.data != 'string') + if (s.processData && typeof s.data != "string") s.data = jQuery.param(s.data); // append data to url for get requests if( s.type.toLowerCase() == "get" ) @@ -614,7 +629,8 @@ jQuery.extend({ // Allow custom headers/mimetypes if( s.beforeSend ) s.beforeSend(xml); - if (s.global) + + if ( s.global ) jQuery.event.trigger("ajaxSend", [xml, s]); // Wait for a response to come back @@ -647,9 +663,8 @@ jQuery.extend({ // Fire the global callback if( s.global ) jQuery.event.trigger( "ajaxSuccess", [xml, s] ); - } else { + } else jQuery.handleError(s, xml, status); - } } catch(e) { status = "error"; jQuery.handleError(s, xml, status, e); @@ -664,7 +679,8 @@ jQuery.extend({ jQuery.event.trigger( "ajaxStop" ); // Process result - if ( s.complete ) s.complete(xml, status); + if ( s.complete ) + s.complete(xml, status); // Stop memory leaks xml.onreadystatechange = function(){}; @@ -674,17 +690,15 @@ jQuery.extend({ xml.onreadystatechange = onreadystatechange; // Timeout checker - if(s.timeout > 0) + if ( s.timeout > 0 ) setTimeout(function(){ // Check to see if the request is still happening - if (xml) { + if ( xml ) { // Cancel the request xml.abort(); - if ( !requestDone ) onreadystatechange( "timeout" ); - - // Clear from memory - xml = null; + if( !requestDone ) + onreadystatechange( "timeout" ); } }, s.timeout); @@ -698,16 +712,20 @@ jQuery.extend({ jQuery.handleError(s, xml, null, e); } + // firefox 1.5 doesn't fire statechange for sync requests + if ( !s.async ) + onreadystatechange(); + // return XMLHttpRequest to allow aborting the request etc. return xml2; }, - handleError: function(s, xml, status, e) { + handleError: function( s, xml, status, e ) { // If a local callback was specified, fire it if ( s.error ) s.error( xml, status, e ); // Fire the global callback - if( s.global ) + if ( s.global ) jQuery.event.trigger( "ajaxError", [xml, s, e] ); }, @@ -715,7 +733,7 @@ jQuery.extend({ active: 0, // Determines if an XMLHttpRequest was successful or not - httpSuccess: function(r) { + httpSuccess: function( r ) { try { return !r.status && location.protocol == "file:" || ( r.status >= 200 && r.status < 300 ) || r.status == 304 || @@ -725,7 +743,7 @@ jQuery.extend({ }, // Determines if an XMLHttpRequest returns NotModified - httpNotModified: function(xml, url) { + httpNotModified: function( xml, url ) { try { var xmlRes = xml.getResponseHeader("Last-Modified"); @@ -742,51 +760,48 @@ jQuery.extend({ * (String) data - The type of data that you're expecting back, * (e.g. "xml", "html", "script") */ - httpData: function(r,type) { + httpData: function( r, type ) { var ct = r.getResponseHeader("content-type"); var data = !type && ct && ct.indexOf("xml") >= 0; data = type == "xml" || data ? r.responseXML : r.responseText; // If the type is "script", eval it in global context - if ( type == "script" ) { + if ( type == "script" ) jQuery.globalEval( data ); - } // Get the JavaScript object, if JSON is used. - if ( type == "json" ) eval( "data = " + data ); + if ( type == "json" ) + eval( "data = " + data ); // evaluate scripts within html - if ( type == "html" ) jQuery("