X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=ecc0c643514350b121717a7a5528cb470ff8fe7a;hb=03b0a9c654727e4bb551865793548c907687a4ae;hp=dd62b42384ae4ca0a92c68ac48b24ff4c7e8bcbb;hpb=fac6a87dcf2cb731692ea5baa647293435cdde01;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index dd62b42..ecc0c64 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -41,27 +41,42 @@ jQuery.fn.extend({ * * @test stop(); // check if load can be called with only url * $('#first').load("data/name.php"); - * setTimeout(function() { + * $.get("data/name.php", function() { * ok( $('#first').text() == 'ERROR', 'Check if load works without callback'); * start(); - * }, 500); + * }); + * + * @test stop(); + * window.foobar = undefined; + * window.foo = undefined; + * var verifyEvaluation = function() { + * ok( foobar == "bar", 'Check if script src was evaluated after load' ); + * ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM'); + * ok( $('#ap').html() == 'bar', 'Check if script evaluation has modified DOM'); + * start(); + * }; + * $('#first').load('data/test.html', function() { + * ok( $('#first').html().match(/^html text/), 'Check content after loading html' ); + * ok( foo == "foo", 'Check if script was evaluated after load' ); + * setTimeout(verifyEvaluation, 600); + * }); * * @name load * @type jQuery * @param String url The URL of the HTML file to load. - * @param Hash params A set of key/value pairs that will be sent to the server. + * @param Object params A set of 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 */ load: function( url, params, callback, ifModified ) { if ( url.constructor == Function ) return this.bind("load", url); - + callback = callback || function(){}; - + // Default to a GET request var type = "GET"; - + // If the second parameter was provided if ( params ) { // If it's a function @@ -69,41 +84,40 @@ jQuery.fn.extend({ // We assume that it's the callback callback = params; params = null; - + // Otherwise, build a param string } else { params = jQuery.param( params ); type = "POST"; } } - + var self = this; - + // Request the remote document - jQuery.ajax( type, url, params,function(res, status){ - - if ( status == "success" || !ifModified && status == "notmodified" ) { - // Inject the HTML into all the matched elements - self.html(res.responseText).each( callback, [res.responseText, status] ); - - // Execute all the scripts inside of the newly-injected HTML - jQuery("script", self).each(function(){ - if ( this.src ) - jQuery.getScript( this.src ); - else - eval.call( window, this.text || this.textContent || this.innerHTML || "" ); - }); - } else - callback.apply( self, [res.responseText, status] ); - - }, ifModified); - + jQuery.ajax({ + url: url, + type: type, + data: params, + ifModified: ifModified, + complete: function(res, status){ + 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] ); + } else + callback.apply( self, [res.responseText, status] ); + } + }); return this; }, /** * Serializes a set of input elements into a string of data. - * This will serialize all given elements. If you need + * This will serialize all given elements. If you need * serialization similar to the form submit of a browser, * you should use the form plugin. This is also true for * selects with multiple attribute set, only a single option @@ -125,8 +139,18 @@ jQuery.fn.extend({ */ serialize: function() { return jQuery.param( this ); + }, + + evalScripts: function() { + return this.find('script').each(function(){ + if ( this.src ) + // for some weird reason, it doesn't work if the callback is ommited + jQuery.getScript( this.src, function() {} ); + else + eval.call( window, this.text || this.textContent || this.innerHTML || "" ); + }).end(); } - + }); // If IE is used, create a wrapper for the XMLHttpRequest object @@ -153,7 +177,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @param Function callback The function to execute. * @cat AJAX */ - + /** * Attach a function to be executed whenever all AJAX requests have ended. * @@ -167,7 +191,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @param Function callback The function to execute. * @cat AJAX */ - + /** * Attach a function to be executed whenever an AJAX request completes. * @@ -181,7 +205,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @param Function callback The function to execute. * @cat AJAX */ - + /** * Attach a function to be executed whenever an AJAX request completes * successfully. @@ -196,7 +220,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @param Function callback The function to execute. * @cat AJAX */ - + /** * Attach a function to be executed whenever an AJAX request fails. * @@ -210,7 +234,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * @param Function callback The function to execute. * @cat AJAX */ - + /** * @test stop(); var counter = { complete: 0, success: 0, error: 0 }; * var success = function() { counter.success++ }; @@ -231,7 +255,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * start(); * }}); * }}); - + * @test stop(); var counter = { complete: 0, success: 0, error: 0 }; * counter.error = 0; counter.success = 0; counter.complete = 0; * var success = function() { counter.success++ }; @@ -250,15 +274,15 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) * start(); * }}); * }}); - * + * * @name ajaxHandlersTesting * @private */ - + new function(){ var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess".split(","); - + for ( var i = 0; i < e.length; i++ ) new function(){ var o = e[i]; jQuery.fn[o] = function(f){ @@ -288,29 +312,44 @@ jQuery.extend({ * } * ) * + * @test stop(); + * $.get('data/dashboard.xml', function(xml) { + * var content = []; + * $('tab', xml).each(function() { + * content.push($(this).text()); + * }); + * ok( content[0] == 'blabla', 'Check first tab'); + * ok( content[1] == 'blublu', 'Check second tab'); + * start(); + * }); + * * @name $.get - * @type jQuery + * @type undefined * @param String url The URL of the page to load. * @param Hash params A set of 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 */ get: function( url, data, callback, type, ifModified ) { - if ( data.constructor == Function ) { + if ( data && data.constructor == Function ) { type = callback; callback = data; data = null; } - + // append ? + data or & + data, in case there are already params if ( data ) url += ((url.indexOf("?") > -1) ? "&" : "?") + jQuery.param(data); - + // Build and start the HTTP Request - jQuery.ajax( "GET", url, null, function(r, status) { - if ( callback ) callback( jQuery.httpData(r,type), status ); - }, ifModified); + jQuery.ajax({ + url: url, + ifModified: ifModified, + complete: function(r, status) { + if ( callback ) callback( jQuery.httpData(r,type), status ); + } + }); }, - + /** * Load a remote page using an HTTP GET request, only if it hasn't * been modified since it was last retrieved. All of the arguments to @@ -338,7 +377,7 @@ jQuery.extend({ * }); * * @name $.getIfModified - * @type jQuery + * @type undefined * @param String url The URL of the page to load. * @param Hash params A set of key/value pairs that will be sent to the server. * @param Function callback A function to be executed whenever the data is loaded. @@ -364,16 +403,24 @@ jQuery.extend({ * start(); * }); * + * @test + * $.getScript("data/test.js"); + * ok( true, "Check with single argument, can't verify" ); + * * @name $.getScript - * @type jQuery + * @type undefined * @param String url The URL of the page to load. * @param Function callback A function to be executed whenever the data is loaded. * @cat AJAX */ getScript: function( url, callback ) { - jQuery.get(url, callback, "script"); + if(callback) + jQuery.get(url, null, callback, "script"); + else { + jQuery.get(url, null, null, "script"); + } }, - + /** * Load a remote JSON object using an HTTP GET request. * All of the arguments to the method (except URL) are optional. @@ -405,7 +452,7 @@ jQuery.extend({ * }); * * @name $.getJSON - * @type jQuery + * @type undefined * @param String url The URL of the page to load. * @param Hash params A set of key/value pairs that will be sent to the server. * @param Function callback A function to be executed whenever the data is loaded. @@ -418,7 +465,7 @@ jQuery.extend({ jQuery.get(url, data, "json"); } }, - + /** * Load a remote page using an HTTP POST request. All of the arguments to * the method (except URL) are optional. @@ -448,7 +495,7 @@ jQuery.extend({ * }); * * @name $.post - * @type jQuery + * @type undefined * @param String url The URL of the page to load. * @param Hash params A set of key/value pairs that will be sent to the server. * @param Function callback A function to be executed whenever the data is loaded. @@ -456,11 +503,16 @@ jQuery.extend({ */ post: function( url, data, callback, type ) { // Build and start the HTTP Request - jQuery.ajax( "POST", url, jQuery.param(data), function(r, status) { - if ( callback ) callback( jQuery.httpData(r,type), status ); + jQuery.ajax({ + type: "POST", + url: url, + data: jQuery.param(data), + complete: function(r, status) { + if ( callback ) callback( jQuery.httpData(r,type), status ); + } }); }, - + // timeout (ms) timeout: 0, @@ -514,10 +566,10 @@ jQuery.extend({ * }); * // reset timeout * $.ajaxTimeout(0); - * + * * * @name $.ajaxTimeout - * @type jQuery + * @type undefined * @param Number time How long before an AJAX request times out. * @cat AJAX */ @@ -527,7 +579,7 @@ jQuery.extend({ // Last-Modified header cache for next request lastModified: {}, - + /** * Load a remote page using an HTTP request. This function is the primary * means of making AJAX requests using jQuery. $.ajax() takes one property, @@ -538,7 +590,7 @@ jQuery.extend({ * (String) type - The type of request to make (e.g. "POST" or "GET"). * * (String) url - The URL of the page to request. - * + * * (String) data - A string of data to be sent to the server (POST only). * * (String) dataType - The type of data that you're expecting back from @@ -606,12 +658,56 @@ jQuery.extend({ * } * }); * + * @test stop(); + * window.foobar = undefined; + * window.foo = undefined; + * var verifyEvaluation = function() { + * ok( foobar == "bar", 'Check if script src was evaluated for datatype html' ); + * start(); + * }; + * $.ajax({ + * dataType: "html", + * url: "data/test.html", + * success: function(data) { + * ok( data.match(/^html text/), 'Check content for datatype html' ); + * ok( foo == "foo", 'Check if script was evaluated for datatype html' ); + * setTimeout(verifyEvaluation, 600); + * } + * }); + * + * @test stop(); + * $.ajax({ + * url: "data/with_fries.xml", dataType: "xml", type: "GET", data: "", success: function(resp) { + * ok( $("properties", resp).length == 1, 'properties in responseXML' ); + * ok( $("jsconf", resp).length == 1, 'jsconf in responseXML' ); + * ok( $("thing", resp).length == 2, 'things in responseXML' ); + * start(); + * } + * }); + * * @name $.ajax - * @type jQuery + * @type undefined * @param Hash prop A set of properties to initialize the request with. * @cat AJAX */ - ajax: function( type, url, data, ret, ifModified ) { + //ajax: function( type, url, data, ret, ifModified ) { + ajax: function( s ) { + + var fvoid = function() {}; + s = jQuery.extend({ + global: true, + ifModified: false, + type: "GET", + timeout: jQuery.timeout, + complete: fvoid, + success: fvoid, + error: fvoid, + dataType: null, + data: null, + url: null + }, s); + + /* // If only a single argument was passed in, // assume that it is a object of key/value pairs if ( !url ) { @@ -621,49 +717,50 @@ jQuery.extend({ var dataType = type.dataType; var global = typeof type.global == "boolean" ? type.global : true; var timeout = typeof type.timeout == "number" ? type.timeout : jQuery.timeout; - var ifModified = type.ifModified || false; + ifModified = type.ifModified || false; data = type.data; url = type.url; type = type.type; } - + */ + // Watch for a new set of requests - if ( global && ! jQuery.active++ ) + if ( s.global && ! jQuery.active++ ) jQuery.event.trigger( "ajaxStart" ); var requestDone = false; - + // Create the request object var xml = new XMLHttpRequest(); - + // Open the socket - xml.open(type || "GET", url, true); - + xml.open(s.type, s.url, true); + // Set the correct header, if data is being sent - if ( data ) + if ( s.data ) xml.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); - + // Set the If-Modified-Since header, if ifModified mode. - if ( ifModified ) + if ( s.ifModified ) xml.setRequestHeader("If-Modified-Since", - jQuery.lastModified[url] || "Thu, 01 Jan 1970 00:00:00 GMT" ); - + jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" ); + // Set header so the called script knows that it's an XMLHttpRequest xml.setRequestHeader("X-Requested-With", "XMLHttpRequest"); - + // Make sure the browser sends the right content length if ( xml.overrideMimeType ) xml.setRequestHeader("Connection", "close"); - + // Wait for a response to come back - var onreadystatechange = function(istimeout){ + var onreadystatechange = function(isTimeout){ // The transfer is complete and the data is available, or the request timed out - if ( xml && (xml.readyState == 4 || istimeout == "timeout") ) { + if ( xml && (xml.readyState == 4 || isTimeout == "timeout") ) { requestDone = true; - var status = jQuery.httpSuccess( xml ) && istimeout != "timeout" ? - ifModified && jQuery.httpNotModified( xml, url ) ? "notmodified" : "success" : "error"; - + var status = jQuery.httpSuccess( xml ) && isTimeout != "timeout" ? + s.ifModified && jQuery.httpNotModified( xml, s.url ) ? "notmodified" : "success" : "error"; + // Make sure that the request was successful or notmodified if ( status != "error" ) { // Cache Last-Modified header, if ifModified mode. @@ -671,49 +768,49 @@ jQuery.extend({ try { modRes = xml.getResponseHeader("Last-Modified"); } catch(e) {} // swallow exception thrown by FF if header is not available - - if ( ifModified && modRes ) - jQuery.lastModified[url] = modRes; - + + if ( s.ifModified && modRes ) + jQuery.lastModified[s.url] = modRes; + // If a local callback was specified, fire it - if ( success ) - success( jQuery.httpData( xml, dataType ), status ); - + if ( s.success ) + s.success( jQuery.httpData( xml, s.dataType ), status ); + // Fire the global callback - if( global ) + if( s.global ) jQuery.event.trigger( "ajaxSuccess" ); - + // Otherwise, the request was not successful } else { // If a local callback was specified, fire it - if ( error ) error( xml, status ); - + if ( s.error ) s.error( xml, status ); + // Fire the global callback - if( global ) + if( s.global ) jQuery.event.trigger( "ajaxError" ); } - + // The request was completed - if( global ) + if( s.global ) jQuery.event.trigger( "ajaxComplete" ); - + // Handle the global AJAX counter - if ( global && ! --jQuery.active ) + if ( s.global && ! --jQuery.active ) jQuery.event.trigger( "ajaxStop" ); - + // Process result - if ( ret ) ret(xml, status); - + if ( s.complete ) s.complete(xml, status); + // Stop memory leaks xml.onreadystatechange = function(){}; xml = null; - + } }; xml.onreadystatechange = onreadystatechange; - + // Timeout checker - if(timeout > 0) + if(s.timeout > 0) setTimeout(function(){ // Check to see if the request is still happening if (xml) { @@ -725,15 +822,15 @@ jQuery.extend({ // Clear from memory xml = null; } - }, timeout); - + }, s.timeout); + // Send the data - xml.send(data); + xml.send(s.data); }, - + // Counter for holding the number of active queries active: 0, - + // Determines if an XMLHttpRequest was successful or not httpSuccess: function(r) { try { @@ -757,7 +854,7 @@ jQuery.extend({ return false; }, - + /* Get the data out of an XMLHttpRequest. * Return parsed XML if content-type header is "xml" and type is "xml" or omitted, * otherwise return plain text. @@ -775,28 +872,31 @@ jQuery.extend({ // Get the JavaScript object, if JSON is used. if ( type == "json" ) eval( "data = " + data ); + // evaluate scripts within html + if ( type == "html" ) jQuery("
").html(data).evalScripts(); + return data; }, - + // Serialize an array of form elements or a set of // key/values into a query string param: function(a) { var s = []; - + // If an array was passed in, assume that it is an array // of form elements if ( a.constructor == Array || a.jquery ) { // Serialize the form elements for ( var i = 0; i < a.length; i++ ) s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) ); - + // Otherwise, assume that it's an object of key/value pairs } else { // Serialize the key/values for ( var j in a ) s.push( j + "=" + encodeURIComponent( a[j] ) ); } - + // Return the resulting serialization return s.join("&"); }