X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=3c9cfdccb458614ee04a9d6c7935ce37e1ae01d6;hb=7b780def0d7843e26d6a26dbc60499ea75f09e59;hp=5aeb9439a551b704617e82bd7f754b23c586958a;hpb=7b2c84ddbe004ed4ab2ee3982af40b7275d7dfde;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 5aeb943..3c9cfdc 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -41,10 +41,23 @@ 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(); - * }, 100); + * }); + * + * @test stop(); + * foobar = undefined; + * foo = undefined; + * var verifyEvaluation = function() { + * ok( foobar == "bar", 'Check if script src was evaluated after load' ); + * 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 @@ -80,24 +93,23 @@ jQuery.fn.extend({ 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; }, @@ -125,6 +137,16 @@ 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(); } }); @@ -288,6 +310,17 @@ 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 * @param String url The URL of the page to load. @@ -296,7 +329,7 @@ jQuery.extend({ * @cat AJAX */ get: function( url, data, callback, type, ifModified ) { - if ( data.constructor == Function ) { + if ( data && data.constructor == Function ) { type = callback; callback = data; data = null; @@ -306,9 +339,13 @@ jQuery.extend({ 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 ); + } + }); }, /** @@ -364,6 +401,10 @@ jQuery.extend({ * start(); * }); * + * @test + * $.getScript("data/test.js"); + * ok( true, "Check with single argument, can't verify" ); + * * @name $.getScript * @type jQuery * @param String url The URL of the page to load. @@ -371,7 +412,11 @@ jQuery.extend({ * @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"); + } }, /** @@ -456,8 +501,13 @@ 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 ); + } }); }, @@ -606,14 +656,58 @@ jQuery.extend({ * } * }); * + * @test stop(); + * foobar = undefined; + * 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 * @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 + // assume that it is a object of key/value pairs if ( !url ) { ret = type.complete; var success = type.success; @@ -621,14 +715,15 @@ 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; @@ -637,16 +732,16 @@ jQuery.extend({ 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"); @@ -656,13 +751,13 @@ jQuery.extend({ 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" ) { @@ -672,37 +767,37 @@ jQuery.extend({ 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(){}; @@ -713,7 +808,7 @@ jQuery.extend({ 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,10 +820,10 @@ 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 @@ -774,6 +869,9 @@ 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; },