From 6ae392a4e57834224b2a686d774ab210da25daa5 Mon Sep 17 00:00:00 2001 From: John Resig Date: Thu, 22 Jun 2006 20:14:41 +0000 Subject: [PATCH] Updated global namespaces. --- ajax/ajax.js | 48 ++++---- event/event.js | 64 +++++----- fx/fx.js | 46 +++---- jquery/jquery.js | 359 ++++++++++++++++++++++++++++++------------------------ 4 files changed, 279 insertions(+), 238 deletions(-) diff --git a/ajax/ajax.js b/ajax/ajax.js index 72aa82f..2586f3f 100644 --- a/ajax/ajax.js +++ b/ajax/ajax.js @@ -5,7 +5,7 @@ /** * Load HTML from a remote file and inject it into the DOM */ -$.fn.load = function( url, params, callback ) { +jQuery.prototype.load = function( url, params, callback ) { // I overwrote the event plugin's .load // this won't happen again, I hope -John if ( url && url.constructor == Function ) @@ -24,7 +24,7 @@ $.fn.load = function( url, params, callback ) { // Otherwise, build a param string } else { - params = $.param( params ); + params = jQuery.param( params ); type = "POST"; } } @@ -32,7 +32,7 @@ $.fn.load = function( url, params, callback ) { var self = this; // Request the remote document - $.ajax( type, url, params,function(res){ + jQuery.ajax( type, url, params,function(res){ // Inject the HTML into all the matched elements self.html(res.responseText).each(function(){ @@ -55,25 +55,25 @@ $.fn.load = function( url, params, callback ) { /** * Load a remote page using a GET request */ -$.get = function( url, callback, type ) { +jQuery.get = function( url, callback, type ) { // Build and start the HTTP Request - $.ajax( "GET", url, null, function(r) { - if ( callback ) callback( $.httpData(r,type) ); + jQuery.ajax( "GET", url, null, function(r) { + if ( callback ) callback( jQuery.httpData(r,type) ); }); }; /** * Load a remote page using a POST request. */ -$.post = function( url, data, callback, type ) { +jQuery.post = function( url, data, callback, type ) { // Build and start the HTTP Request - $.ajax( "POST", url, $.param(data), function(r) { - if ( callback ) callback( $.httpData(r,type) ); + jQuery.ajax( "POST", url, jQuery.param(data), function(r) { + if ( callback ) callback( jQuery.httpData(r,type) ); }); }; // If IE is used, create a wrapper for the XMLHttpRequest object -if ( $.browser == "msie" ) +if ( jQuery.browser == "msie" ) XMLHttpRequest = function(){ return new ActiveXObject( (navigator.userAgent.toLowerCase().indexOf("msie 5") >= 0) ? @@ -87,14 +87,14 @@ if ( $.browser == "msie" ) for ( var i = 0; i < e.length; i++ ){ (function(){ var o = e[i]; - $.fn[o] = function(f){return this.bind(o, f);}; + jQuery.fn[o] = function(f){return this.bind(o, f);}; })();} })(); /** * A common wrapper for making XMLHttpRequests */ -$.ajax = function( type, url, data, ret ) { +jQuery.ajax = function( type, url, data, ret ) { // If only a single argument was passed in, // assume that it is a object of key/value pairs if ( !url ) { @@ -128,28 +128,28 @@ $.ajax = function( type, url, data, ret ) { // Socket is openend if ( xml.readyState == 1 ) { // Increase counter - $.ajax.active++; + jQuery.ajax.active++; // Show 'loader' - $.event.trigger( "ajaxStart" ); + jQuery.event.trigger( "ajaxStart" ); } // Socket is closed and data is available if ( xml.readyState == 4 ) { // Hide loader if needed - if ( ! --$.ajax.active ) { - $.event.trigger( "ajaxComplete" ); - $.ajax.active = 0 + if ( ! --jQuery.ajax.active ) { + jQuery.event.trigger( "ajaxComplete" ); + jQuery.ajax.active = 0 } // Make sure that the request was successful - if ( $.httpSuccess( xml ) ) { + if ( jQuery.httpSuccess( xml ) ) { // If a local callback was specified, fire it if ( success ) success( xml ); // Fire the global callback - $.event.trigger( "ajaxSuccess" ); + jQuery.event.trigger( "ajaxSuccess" ); // Otherwise, the request was not successful } else { @@ -157,7 +157,7 @@ $.ajax = function( type, url, data, ret ) { if ( error ) error( xml ); // Fire the global callback - $.event.trigger( "ajaxError" ); + jQuery.event.trigger( "ajaxError" ); } // Process result @@ -170,16 +170,16 @@ $.ajax = function( type, url, data, ret ) { }; // Counter for holding the number of active queries -$.ajax.active = 0; +jQuery.ajax.active = 0; // Determines if an XMLHttpRequest was successful or not -$.httpSuccess = function(r) { +jQuery.httpSuccess = function(r) { return ( r.status && ( r.status >= 200 && r.status < 300 ) || r.status == 304 ) || !r.status && location.protocol == "file:"; }; // Get the data out of an XMLHttpRequest -$.httpData = function(r,type) { +jQuery.httpData = function(r,type) { // Check the headers, or watch for a force override return r.getResponseHeader("content-type").indexOf("xml") > 0 || type == "xml" ? r.responseXML : r.responseText; @@ -187,7 +187,7 @@ $.httpData = function(r,type) { // Serialize an array of form elements or a set of // key/values into a query string -$.param = function(a) { +jQuery.param = function(a) { var s = []; // If an array was passed in, assume that it is an array diff --git a/event/event.js b/event/event.js index 485dc4e..4171562 100644 --- a/event/event.js +++ b/event/event.js @@ -1,11 +1,11 @@ // We're overriding the old toggle function, so // remember it for later -$.fn._toggle = $.fn.toggle; +jQuery.prototype._toggle = jQuery.prototype.toggle; /** * Toggle between two function calls every other click. */ -$.fn.toggle = function(a,b) { +jQuery.prototype.toggle = function(a,b) { // If two functions are passed in, we're // toggling on a click return a && b ? this.click(function(e){ @@ -16,7 +16,7 @@ $.fn.toggle = function(a,b) { e.preventDefault(); // and execute the function - return $.apply( this, this.last, [e] ) || false; + return jQuery.apply( this, this.last, [e] ) || false; }) : // Otherwise, execute the old toggle function @@ -26,7 +26,7 @@ $.fn.toggle = function(a,b) { /** * Toggle between two function calls on mouse over/out. */ -$.fn.hover = function(f,g) { +jQuery.prototype.hover = function(f,g) { // A private function for haandling mouse 'hovering' function handleHover(e) { @@ -48,16 +48,16 @@ $.fn.hover = function(f,g) { /** * Bind a function to fire when the DOM is ready. */ -$.fn.ready = function(f) { +jQuery.prototype.ready = function(f) { // If the DOM is already ready - if ( $.isReady ) + if ( jQuery.isReady ) // Execute the function immediately - $.apply( document, f ); + jQuery.apply( document, f ); // Otherwise, remember the function for later else { // Add the function to the wait list - $.readyList.push( f ); + jQuery.readyList.push( f ); } return this; @@ -78,16 +78,16 @@ $.fn.ready = function(f) { var o = e[i]; // Handle event binding - $.fn[o] = function(f){ return this.bind(o, f); }; + jQuery.prototype[o] = function(f){ return this.bind(o, f); }; // Handle event unbinding - $.fn["un"+o] = function(f){ return this.unbind(o, f); }; + jQuery.prototype["un"+o] = function(f){ return this.unbind(o, f); }; // Handle event triggering - $.fn["do"+o] = function(){ return this.trigger(o); }; + jQuery.prototype["do"+o] = function(){ return this.trigger(o); }; // Finally, handle events that only fire once - $.fn["one"+o] = function(f){ + jQuery.prototype["one"+o] = function(f){ // Attach the event listener return this.bind(o, function(e){ // TODO: Remove the event listener, instead of this hack @@ -100,7 +100,7 @@ $.fn.ready = function(f) { this[o+f]++; // And execute the bound function - return $.apply(this,f,[e]); + return jQuery.apply(this,f,[e]); }); }; @@ -110,36 +110,36 @@ $.fn.ready = function(f) { * All the code that makes DOM Ready work nicely. */ - $.isReady = false; - $.readyList = []; + jQuery.isReady = false; + jQuery.readyList = []; // Handle when the DOM is ready - $.ready = function() { + jQuery.ready = function() { // Make sure that the DOM hasn't already loaded - if ( !$.isReady ) { + if ( !jQuery.isReady ) { // Remember that the DOM is ready - $.isReady = true; + jQuery.isReady = true; // If there are functions bound, to execute - if ( $.readyList ) { + if ( jQuery.readyList ) { // Execute all of them - for ( var i = 0; i < $.readyList.length; i++ ) - $.apply( document, $.readyList[i] ); + for ( var i = 0; i < jQuery.readyList.length; i++ ) + jQuery.apply( document, jQuery.readyList[i] ); // Reset the list of functions - $.readyList = null; + jQuery.readyList = null; } } }; // If Mozilla is used - if ( $.browser == "mozilla" || $.browser == "opera" ) { + if ( jQuery.browser == "mozilla" || jQuery.browser == "opera" ) { // Use the handy event callback - $.event.add( document, "DOMContentLoaded", $.ready ); + jQuery.event.add( document, "DOMContentLoaded", jQuery.ready ); // If IE is used, use the excellent hack by Matthias Miller // http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited - } else if ( $.browser == "msie" ) { + } else if ( jQuery.browser == "msie" ) { // Only works if you document.write() it document.write("