library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated global namespaces.

Browse Source
This commit is contained in:
John Resig 2006-06-22 20:14:41 +00:00
parent 3cc1ba05f3
commit 6ae392a4e5
4 changed files with 279 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ajax/ajax.js
View File

@ -5,7 +5,7 @@
/** /**
* Load HTML from a remote file and inject it into the DOM * 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 // I overwrote the event plugin's .load
// this won't happen again, I hope -John // this won't happen again, I hope -John
if ( url && url.constructor == Function ) if ( url && url.constructor == Function )
@ -24,7 +24,7 @@ $.fn.load = function( url, params, callback ) {
// Otherwise, build a param string // Otherwise, build a param string
} else { } else {
params = $.param( params ); params = jQuery.param( params );
type = "POST"; type = "POST";
} }
} }
@ -32,7 +32,7 @@ $.fn.load = function( url, params, callback ) {
var self = this; var self = this;
// Request the remote document // 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 // Inject the HTML into all the matched elements
self.html(res.responseText).each(function(){ self.html(res.responseText).each(function(){
@ -55,25 +55,25 @@ $.fn.load = function( url, params, callback ) {
/** /**
* Load a remote page using a GET request * 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 // Build and start the HTTP Request
$.ajax( "GET", url, null, function(r) { jQuery.ajax( "GET", url, null, function(r) {
if ( callback ) callback( $.httpData(r,type) ); if ( callback ) callback( jQuery.httpData(r,type) );
}); });
}; };
/** /**
* Load a remote page using a POST request. * 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 // Build and start the HTTP Request
$.ajax( "POST", url, $.param(data), function(r) { jQuery.ajax( "POST", url, jQuery.param(data), function(r) {
if ( callback ) callback( $.httpData(r,type) ); if ( callback ) callback( jQuery.httpData(r,type) );
}); });
}; };
// If IE is used, create a wrapper for the XMLHttpRequest object // If IE is used, create a wrapper for the XMLHttpRequest object
if ( $.browser == "msie" ) if ( jQuery.browser == "msie" )
XMLHttpRequest = function(){ XMLHttpRequest = function(){
return new ActiveXObject( return new ActiveXObject(
(navigator.userAgent.toLowerCase().indexOf("msie 5") >= 0) ? (navigator.userAgent.toLowerCase().indexOf("msie 5") >= 0) ?
@ -87,14 +87,14 @@ if ( $.browser == "msie" )
for ( var i = 0; i < e.length; i++ ){ (function(){ for ( var i = 0; i < e.length; i++ ){ (function(){
var o = e[i]; 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 * 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, // 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 ) { if ( !url ) {
@ -128,28 +128,28 @@ $.ajax = function( type, url, data, ret ) {
// Socket is openend // Socket is openend
if ( xml.readyState == 1 ) { if ( xml.readyState == 1 ) {
// Increase counter // Increase counter
$.ajax.active++; jQuery.ajax.active++;
// Show 'loader' // Show 'loader'
$.event.trigger( "ajaxStart" ); jQuery.event.trigger( "ajaxStart" );
} }
// Socket is closed and data is available // Socket is closed and data is available
if ( xml.readyState == 4 ) { if ( xml.readyState == 4 ) {
// Hide loader if needed // Hide loader if needed
if ( ! --$.ajax.active ) { if ( ! --jQuery.ajax.active ) {
$.event.trigger( "ajaxComplete" ); jQuery.event.trigger( "ajaxComplete" );
$.ajax.active = 0 jQuery.ajax.active = 0
} }
// Make sure that the request was successful // Make sure that the request was successful
if ( $.httpSuccess( xml ) ) { if ( jQuery.httpSuccess( xml ) ) {
// If a local callback was specified, fire it // If a local callback was specified, fire it
if ( success ) success( xml ); if ( success ) success( xml );
// Fire the global callback // Fire the global callback
$.event.trigger( "ajaxSuccess" ); jQuery.event.trigger( "ajaxSuccess" );
// Otherwise, the request was not successful // Otherwise, the request was not successful
} else { } else {
@ -157,7 +157,7 @@ $.ajax = function( type, url, data, ret ) {
if ( error ) error( xml ); if ( error ) error( xml );
// Fire the global callback // Fire the global callback
$.event.trigger( "ajaxError" ); jQuery.event.trigger( "ajaxError" );
} }
// Process result // Process result
@ -170,16 +170,16 @@ $.ajax = function( type, url, data, ret ) {
}; };
// Counter for holding the number of active queries // Counter for holding the number of active queries
$.ajax.active = 0; jQuery.ajax.active = 0;
// Determines if an XMLHttpRequest was successful or not // Determines if an XMLHttpRequest was successful or not
$.httpSuccess = function(r) { jQuery.httpSuccess = function(r) {
return ( r.status && ( r.status >= 200 && r.status < 300 ) || return ( r.status && ( r.status >= 200 && r.status < 300 ) ||
r.status == 304 ) || !r.status && location.protocol == "file:"; r.status == 304 ) || !r.status && location.protocol == "file:";
}; };
// Get the data out of an XMLHttpRequest // 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 // Check the headers, or watch for a force override
return r.getResponseHeader("content-type").indexOf("xml") > 0 || return r.getResponseHeader("content-type").indexOf("xml") > 0 ||
type == "xml" ? r.responseXML : r.responseText; type == "xml" ? r.responseXML : r.responseText;
@ -187,7 +187,7 @@ $.httpData = function(r,type) {
// Serialize an array of form elements or a set of // Serialize an array of form elements or a set of
// key/values into a query string // key/values into a query string
$.param = function(a) { jQuery.param = function(a) {
var s = []; var s = [];
// If an array was passed in, assume that it is an array // If an array was passed in, assume that it is an array

64
event/event.js
View File

@ -1,11 +1,11 @@
// We're overriding the old toggle function, so // We're overriding the old toggle function, so
// remember it for later // remember it for later
$.fn._toggle = $.fn.toggle; jQuery.prototype._toggle = jQuery.prototype.toggle;
/** /**
* Toggle between two function calls every other click. * 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 // If two functions are passed in, we're
// toggling on a click // toggling on a click
return a && b ? this.click(function(e){ return a && b ? this.click(function(e){
@ -16,7 +16,7 @@ $.fn.toggle = function(a,b) {
e.preventDefault(); e.preventDefault();
// and execute the function // 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 // Otherwise, execute the old toggle function
@ -26,7 +26,7 @@ $.fn.toggle = function(a,b) {
/** /**
* Toggle between two function calls on mouse over/out. * 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' // A private function for haandling mouse 'hovering'
function handleHover(e) { function handleHover(e) {
@ -48,16 +48,16 @@ $.fn.hover = function(f,g) {
/** /**
* Bind a function to fire when the DOM is ready. * 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 the DOM is already ready
if ( $.isReady ) if ( jQuery.isReady )
// Execute the function immediately // Execute the function immediately
$.apply( document, f ); jQuery.apply( document, f );
// Otherwise, remember the function for later // Otherwise, remember the function for later
else { else {
// Add the function to the wait list // Add the function to the wait list
$.readyList.push( f ); jQuery.readyList.push( f );
} }
return this; return this;
@ -78,16 +78,16 @@ $.fn.ready = function(f) {
var o = e[i]; var o = e[i];
// Handle event binding // 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 // 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 // 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 // Finally, handle events that only fire once
$.fn["one"+o] = function(f){ jQuery.prototype["one"+o] = function(f){
// Attach the event listener // Attach the event listener
return this.bind(o, function(e){ return this.bind(o, function(e){
// TODO: Remove the event listener, instead of this hack // TODO: Remove the event listener, instead of this hack
@ -100,7 +100,7 @@ $.fn.ready = function(f) {
this[o+f]++; this[o+f]++;
// And execute the bound function // 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. * All the code that makes DOM Ready work nicely.
*/ */
$.isReady = false; jQuery.isReady = false;
$.readyList = []; jQuery.readyList = [];
// Handle when the DOM is ready // Handle when the DOM is ready
$.ready = function() { jQuery.ready = function() {
// Make sure that the DOM hasn't already loaded // Make sure that the DOM hasn't already loaded
if ( !$.isReady ) { if ( !jQuery.isReady ) {
// Remember that the DOM is ready // Remember that the DOM is ready
$.isReady = true; jQuery.isReady = true;
// If there are functions bound, to execute // If there are functions bound, to execute
if ( $.readyList ) { if ( jQuery.readyList ) {
// Execute all of them // Execute all of them
for ( var i = 0; i < $.readyList.length; i++ ) for ( var i = 0; i < jQuery.readyList.length; i++ )
$.apply( document, $.readyList[i] ); jQuery.apply( document, jQuery.readyList[i] );
// Reset the list of functions // Reset the list of functions
$.readyList = null; jQuery.readyList = null;
} }
} }
}; };
// If Mozilla is used // If Mozilla is used
if ( $.browser == "mozilla" || $.browser == "opera" ) { if ( jQuery.browser == "mozilla" || jQuery.browser == "opera" ) {
// Use the handy event callback // 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 // If IE is used, use the excellent hack by Matthias Miller
// http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited // 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 // Only works if you document.write() it
document.write("<scr" + "ipt id=__ie_init defer=true " + document.write("<scr" + "ipt id=__ie_init defer=true " +
@ -149,31 +149,31 @@ $.fn.ready = function(f) {
var script = document.getElementById("__ie_init"); var script = document.getElementById("__ie_init");
script.onreadystatechange = function() { script.onreadystatechange = function() {
if ( this.readyState == "complete" ) if ( this.readyState == "complete" )
$.ready(); jQuery.ready();
}; };
// Clear from memory // Clear from memory
script = null; script = null;
// If Safari is used // If Safari is used
} else if ( $.browser == "safari" ) { } else if ( jQuery.browser == "safari" ) {
// Continually check to see if the document.readyState is valid // Continually check to see if the document.readyState is valid
$.safariTimer = setInterval(function(){ jQuery.safariTimer = setInterval(function(){
// loaded and complete are both valid states // loaded and complete are both valid states
if ( document.readyState == "loaded" || if ( document.readyState == "loaded" ||
document.readyState == "complete" ) { document.readyState == "complete" ) {
// If either one are found, remove the timer // If either one are found, remove the timer
clearInterval( $.safariTimer ); clearInterval( jQuery.safariTimer );
$.safariTimer = null; jQuery.safariTimer = null;
// and execute any waiting functions // and execute any waiting functions
$.ready(); jQuery.ready();
} }
}, 10); }, 10);
} }
// A fallback to window.onload, that will always work // A fallback to window.onload, that will always work
$.event.add( window, "load", $.ready ); jQuery.event.add( window, "load", jQuery.ready );
})(); })();

46
fx/fx.js
View File

@ -1,5 +1,5 @@
// overwrite the old show method // overwrite the old show method
$.fn._show = $.fn.show; jQuery.prototype._show = jQuery.prototype.show;
/** /**
* The effects module overloads the show method to now allow * The effects module overloads the show method to now allow
@ -12,14 +12,14 @@ $.fn._show = $.fn.show;
* that are already shown. This can be circumvented by doing this: * that are already shown. This can be circumvented by doing this:
* $("p:hidden").show("slow"); * $("p:hidden").show("slow");
*/ */
$.fn.show = function(speed,callback){ jQuery.prototype.show = function(speed,callback){
return speed ? this.animate({ return speed ? this.animate({
height: "show", width: "show", opacity: "show" height: "show", width: "show", opacity: "show"
}, speed, callback) : this._show(); }, speed, callback) : this._show();
}; };
// We're overwriting the old hide method // We're overwriting the old hide method
$.fn._hide = $.fn.hide; jQuery.prototype._hide = jQuery.prototype.hide;
/** /**
@ -27,7 +27,7 @@ $.fn._hide = $.fn.hide;
* but is just the opposite. * but is just the opposite.
* $("p:visible").hide("slow"); * $("p:visible").hide("slow");
*/ */
$.fn.hide = function(speed,callback){ jQuery.prototype.hide = function(speed,callback){
return speed ? this.animate({ return speed ? this.animate({
height: "hide", height: "hide",
width: "hide", width: "hide",
@ -41,7 +41,7 @@ $.fn.hide = function(speed,callback){
* the width - creating a neat sliding effect. * the width - creating a neat sliding effect.
* $("p:hidden").slideDown("slow"); * $("p:hidden").slideDown("slow");
*/ */
$.fn.slideDown = function(speed,callback){ jQuery.prototype.slideDown = function(speed,callback){
return this.animate({height: "show"}, speed, callback); return this.animate({height: "show"}, speed, callback);
}; };
@ -49,7 +49,7 @@ $.fn.slideDown = function(speed,callback){
* Just like slideDown, only it hides all matched elements. * Just like slideDown, only it hides all matched elements.
* $("p:visible").slideUp("slow"); * $("p:visible").slideUp("slow");
*/ */
$.fn.slideUp = function(speed,callback){ jQuery.prototype.slideUp = function(speed,callback){
return this.animate({height: "hide"}, speed, callback); return this.animate({height: "hide"}, speed, callback);
}; };
@ -58,7 +58,7 @@ $.fn.slideUp = function(speed,callback){
* to a fully visible, state. * to a fully visible, state.
* $("p:hidden").fadeIn("slow"); * $("p:hidden").fadeIn("slow");
*/ */
$.fn.fadeIn = function(speed,callback){ jQuery.prototype.fadeIn = function(speed,callback){
return this.animate({opacity: "show"}, speed, callback); return this.animate({opacity: "show"}, speed, callback);
}; };
@ -66,25 +66,25 @@ $.fn.fadeIn = function(speed,callback){
* Same as fadeIn, but transitions from a visible, to a hidden state. * Same as fadeIn, but transitions from a visible, to a hidden state.
* $("p:visible").fadeOut("slow"); * $("p:visible").fadeOut("slow");
*/ */
$.fn.fadeOut = function(speed,callback){ jQuery.prototype.fadeOut = function(speed,callback){
return this.animate({opacity: "hide"}, speed, callback); return this.animate({opacity: "hide"}, speed, callback);
}; };
/** /**
* ... * ...
*/ */
$.fn.fadeTo = function(speed,to,callback){ jQuery.prototype.fadeTo = function(speed,to,callback){
return this.animate({opacity: to}, speed, callback); return this.animate({opacity: to}, speed, callback);
}; };
/** /**
* *
*/ */
$.fn.animate = function(prop,speed,callback) { jQuery.prototype.animate = function(prop,speed,callback) {
return this.queue(function(){ return this.queue(function(){
var i = 0; var i = 0;
for ( var p in prop ) { for ( var p in prop ) {
var e = new fx( this, $.speed(speed,callback,i++), p ); var e = new fx( this, jQuery.speed(speed,callback,i++), p );
if ( prop[p].constructor == Number ) if ( prop[p].constructor == Number )
e.custom( e.cur(), prop[p] ); e.custom( e.cur(), prop[p] );
else else
@ -93,7 +93,7 @@ $.fn.animate = function(prop,speed,callback) {
}); });
}; };
$.speed = function(s,o,i) { jQuery.speed = function(s,o,i) {
o = o || {}; o = o || {};
if ( o.constructor == Function ) if ( o.constructor == Function )
@ -105,7 +105,7 @@ $.speed = function(s,o,i) {
// Queueing // Queueing
o.oldComplete = o.complete; o.oldComplete = o.complete;
o.complete = function(){ o.complete = function(){
$.dequeue(this, "fx"); jQuery.dequeue(this, "fx");
if ( o.oldComplete && o.oldComplete.constructor == Function ) if ( o.oldComplete && o.oldComplete.constructor == Function )
o.oldComplete.apply( this ); o.oldComplete.apply( this );
}; };
@ -116,9 +116,9 @@ $.speed = function(s,o,i) {
return o; return o;
}; };
$.queue = {}; jQuery.queue = {};
$.dequeue = function(elem,type){ jQuery.dequeue = function(elem,type){
type = type || "fx"; type = type || "fx";
if ( elem.queue && elem.queue[type] ) { if ( elem.queue && elem.queue[type] ) {
@ -133,7 +133,7 @@ $.dequeue = function(elem,type){
} }
}; };
$.fn.queue = function(type,fn){ jQuery.prototype.queue = function(type,fn){
if ( !fn ) { if ( !fn ) {
fn = type; fn = type;
type = "fx"; type = "fx";
@ -153,11 +153,11 @@ $.fn.queue = function(type,fn){
}); });
}; };
$.setAuto = function(e,p) { jQuery.setAuto = function(e,p) {
var a = e.style[p]; var a = e.style[p];
var o = $.css(e,p); var o = jQuery.css(e,p);
e.style[p] = "auto"; e.style[p] = "auto";
var n = $.css(e,p); var n = jQuery.css(e,p);
if ( o != n ) if ( o != n )
e.style[p] = a; e.style[p] = a;
}; };
@ -168,7 +168,7 @@ $.setAuto = function(e,p) {
* people. You've been warned. * people. You've been warned.
*/ */
$.fx = function( elem, options, prop ){ jQuery.fx = function( elem, options, prop ){
var z = this; var z = this;
@ -202,7 +202,7 @@ $.fx = function( elem, options, prop ){
// Get the current size // Get the current size
z.cur = function(){ z.cur = function(){
return parseFloat( $.css(z.el,prop) ); return parseFloat( jQuery.css(z.el,prop) );
}; };
// Start an animation from one number to another // Start an animation from one number to another
@ -233,7 +233,7 @@ $.fx = function( elem, options, prop ){
}; };
// IE has trouble with opacity if it doesn't have layout // IE has trouble with opacity if it doesn't have layout
if ( $.browser == "msie" && !z.el.currentStyle.hasLayout ) if ( jQuery.browser == "msie" && !z.el.currentStyle.hasLayout )
y.zoom = 1; y.zoom = 1;
// Remember the overflow of the element // Remember the overflow of the element
@ -260,7 +260,7 @@ $.fx = function( elem, options, prop ){
// If the element was shown, and not using a custom number, // If the element was shown, and not using a custom number,
// set its height and/or width to auto // set its height and/or width to auto
if ( (prop == "height" || prop == "width") && z.o.auto ) if ( (prop == "height" || prop == "width") && z.o.auto )
$.setAuto( z.el, prop ); jQuery.setAuto( z.el, prop );
// If a callback was provided, execute it // If a callback was provided, execute it
if( z.o.complete.constructor == Function ) { if( z.o.complete.constructor == Function ) {

359
jquery/jquery.js vendored
View File

@ -12,27 +12,52 @@
// Global undefined variable // Global undefined variable
window.undefined = window.undefined; window.undefined = window.undefined;
/**
* Create a new jQuery Object
* @constructor
*/
function jQuery(a,c) { function jQuery(a,c) {
this.cur = $.Select( if ( window == this )
a || $.context || document, return new jQuery(a,c);
c && c.$jquery && c.get(0) || c
this.cur = jQuery.Select(
a || jQuery.context || document,
c && c.jquery && c.get(0) || c
); );
} }
if ( window.$ == undefined ) /**
var $ = function(a,c) { * The jQuery query object.
return new jQuery(a,c); */
}; var $ = jQuery;
jQuery.prototype = $.fn = { jQuery.fn = jQuery.prototype = {
$jquery: "$Rev$", /**
* The current SVN version of jQuery.
*
* @private
* @type String
*/
jquery: "$Rev$",
// The only two getters /**
* The number of elements currently matched.
*
* @type Number
*/
size: function() { size: function() {
return this.get().length; return this.get().length;
}, },
get: function(i) {
return i == undefined ? this.cur : this.cur[i]; /**
* Access the elements matched. If a number is provided,
* the Nth element is returned, otherwise, an array of all
* matched items is returned.
*
* @type Array,DOMElement
*/
get: function(num) {
return num == undefined ? this.cur : this.cur[num];
}, },
each: function(f) { each: function(f) {
@ -44,9 +69,9 @@ jQuery.prototype = $.fn = {
return this.each(function(){ return this.each(function(){
if ( b == undefined ) if ( b == undefined )
for ( var j in a ) for ( var j in a )
$.attr(this,j,a[j]); jQuery.attr(this,j,a[j]);
else else
$.attr(this,a,b); jQuery.attr(this,a,b);
}); });
}, },
html: function(h) { html: function(h) {
@ -64,7 +89,7 @@ jQuery.prototype = $.fn = {
for ( var i = 0; i < e[j].childNodes.length; i++ ) for ( var i = 0; i < e[j].childNodes.length; i++ )
t += e[j].childNodes[i].nodeType != 1 ? t += e[j].childNodes[i].nodeType != 1 ?
e[j].childNodes[i].nodeValue : e[j].childNodes[i].nodeValue :
$.fn.text(e[j].childNodes[i].childNodes); jQuery.fn.text(e[j].childNodes[i].childNodes);
return t; return t;
}, },
@ -73,15 +98,15 @@ jQuery.prototype = $.fn = {
this.each(function(){ this.each(function(){
if ( !b ) if ( !b )
for ( var j in a ) for ( var j in a )
$.attr(this.style,j,a[j]); jQuery.attr(this.style,j,a[j]);
else else
$.attr(this.style,a,b); jQuery.attr(this.style,a,b);
}) : $.css( this.get(0), a ); }) : jQuery.css( this.get(0), a );
}, },
toggle: function() { toggle: function() {
return this.each(function(){ return this.each(function(){
var d = $.css(this,"display"); var d = jQuery.css(this,"display");
if ( d == "none" || d === "" ) if ( !d || d == "none" )
$(this).show(); $(this).show();
else else
$(this).hide(); $(this).hide();
@ -90,13 +115,13 @@ jQuery.prototype = $.fn = {
show: function() { show: function() {
return this.each(function(){ return this.each(function(){
this.style.display = this.oldblock ? this.oldblock : ""; this.style.display = this.oldblock ? this.oldblock : "";
if ( $.css(this,"display") == "none" ) if ( jQuery.css(this,"display") == "none" )
this.style.display = "block"; this.style.display = "block";
}); });
}, },
hide: function() { hide: function() {
return this.each(function(){ return this.each(function(){
this.oldblock = $.css(this,"display"); this.oldblock = jQuery.css(this,"display");
if ( this.oldblock == "none" ) if ( this.oldblock == "none" )
this.oldblock = "block"; this.oldblock = "block";
this.style.display = "none"; this.style.display = "none";
@ -104,31 +129,30 @@ jQuery.prototype = $.fn = {
}, },
addClass: function(c) { addClass: function(c) {
return this.each(function(){ return this.each(function(){
$.class.add(this,c); jQuery.class.add(this,c);
}); });
}, },
removeClass: function(c) { removeClass: function(c) {
return this.each(function(){ return this.each(function(){
$.class.remove(this,c); jQuery.class.remove(this,c);
}); });
}, },
// TODO: Optomize
toggleClass: function(c) { toggleClass: function(c) {
return this.each(function(){ return this.each(function(){
if ($.hasWord(this,c)) if (jQuery.hasWord(this,c))
$.class.remove(this,c); jQuery.class.remove(this,c);
else else
$.class.add(this,c); jQuery.class.add(this,c);
}); });
}, },
remove: function() { remove: function() {
this.each(function(){this.parentNode.removeChild( this );}); this.each(function(){this.parentNode.removeChild( this );});
this.cur = []; return this.pushStack( [] );
return this;
}, },
wrap: function() { wrap: function() {
var a = $.clean(arguments); var a = jQuery.clean(arguments);
return this.each(function(){ return this.each(function(){
var b = a[0].cloneNode(true); var b = a[0].cloneNode(true);
this.parentNode.insertBefore( b, this ); this.parentNode.insertBefore( b, this );
@ -140,7 +164,7 @@ jQuery.prototype = $.fn = {
append: function() { append: function() {
var clone = this.size() > 1; var clone = this.size() > 1;
var a = $.clean(arguments); var a = jQuery.clean(arguments);
return this.domManip(function(){ return this.domManip(function(){
for ( var i = 0; i < a.length; i++ ) for ( var i = 0; i < a.length; i++ )
this.appendChild( clone ? a[i].cloneNode(true) : a[i] ); this.appendChild( clone ? a[i].cloneNode(true) : a[i] );
@ -157,7 +181,7 @@ jQuery.prototype = $.fn = {
prepend: function() { prepend: function() {
var clone = this.size() > 1; var clone = this.size() > 1;
var a = $.clean(arguments); var a = jQuery.clean(arguments);
return this.domManip(function(){ return this.domManip(function(){
for ( var i = a.length - 1; i >= 0; i-- ) for ( var i = a.length - 1; i >= 0; i-- )
this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild ); this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild );
@ -166,7 +190,7 @@ jQuery.prototype = $.fn = {
before: function() { before: function() {
var clone = this.size() > 1; var clone = this.size() > 1;
var a = $.clean(arguments); var a = jQuery.clean(arguments);
return this.each(function(){ return this.each(function(){
for ( var i = 0; i < a.length; i++ ) for ( var i = 0; i < a.length; i++ )
this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this ); this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this );
@ -175,7 +199,7 @@ jQuery.prototype = $.fn = {
after: function() { after: function() {
var clone = this.size() > 1; var clone = this.size() > 1;
var a = $.clean(arguments); var a = jQuery.clean(arguments);
return this.each(function(){ return this.each(function(){
for ( var i = a.length - 1; i >= 0; i-- ) for ( var i = a.length - 1; i >= 0; i-- )
this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling ); this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling );
@ -190,72 +214,90 @@ jQuery.prototype = $.fn = {
}, },
bind: function(t,f) { bind: function(t,f) {
return this.each(function(){$.event.add(this,t,f);}); return this.each(function(){jQuery.event.add(this,t,f);});
}, },
unbind: function(t,f) { unbind: function(t,f) {
return this.each(function(){$.event.remove(this,t,f);}); return this.each(function(){jQuery.event.remove(this,t,f);});
}, },
trigger: function(t) { trigger: function(t) {
return this.each(function(){$.event.trigger(this,t);}); return this.each(function(){jQuery.event.trigger(this,t);});
},
pushStack: function(a) {
if ( !this.stack ) this.stack = [];
this.stack.unshift( this.cur );
if ( a ) this.cur = a;
return this;
}, },
find: function(t) { find: function(t) {
var old = [], ret = []; var ret = [];
this.each(function(){ this.each(function(){
old[old.length] = this; ret = jQuery.merge( ret, jQuery.Select(t,this) );
ret = $.merge( ret, $.Select(t,this) );
}); });
this.old = old; this.pushStack( ret );
this.cur = ret;
return this; return this;
}, },
end: function() { end: function() {
this.cur = this.old; this.cur = this.stack.shift();
return this; return this;
}, },
parent: function(a) { parent: function(a) {
this.cur = $.map(this.cur,"d.parentNode"); var ret = jQuery.map(this.cur,"d.parentNode");
if ( a ) this.cur = $.filter(a,this.cur).r; if ( a ) ret = jQuery.filter(a,ret).r;
return this; return this.pushStack(ret);
}, },
parents: function(a) { parents: function(a) {
this.cur = $.map(this.cur,$.parents); var ret = jQuery.map(this.cur,jQuery.parents);
if ( a ) this.cur = $.filter(a,this.cur).r; if ( a ) ret = jQuery.filter(a,ret).r;
return this; return this.pushStack(ret);
}, },
siblings: function(a) { siblings: function(a) {
// Incorrect, need to exclude current element // Incorrect, need to exclude current element
this.cur = $.map(this.cur,$.sibling); var ret = jQuery.map(this.cur,jQuery.sibling);
if ( a ) this.cur = $.filter(a,this.cur).r; if ( a ) ret = jQuery.filter(a,ret).r;
return this; return this.pushStack(ret);
}, },
filter: function(t) { filter: function(t) {
this.cur = $.filter(t,this.cur).r; return this.pushStack( jQuery.filter(t,this.cur).r );
return this;
}, },
not: function(t) { not: function(t) {
this.cur = t.constructor == String ? return this.pushStack( t.constructor == String ?
$.filter(t,this.cur,false).r : jQuery.filter(t,this.cur,false).r :
$.grep(this.cur,function(a){ return a != t; }); jQuery.grep(this.cur,function(a){ return a != t; }) );
return this;
}, },
add: function(t) { add: function(t) {
this.cur = $.merge( this.cur, t.constructor == String ? return this.pushStack( jQuery.merge( this.cur, t.constructor == String ?
$.Select(t) : t.constructor == Array ? t : [t] ); jQuery.Select(t) : t.constructor == Array ? t : [t] ) );
return this;
},
is: function(t) {
return $.filter(t,this.cur).r.length > 0;
}, },
/** /**
* A wrapper function for each() to be used by append and prepend. * A wrapper function for each() to be used by append and prepend.
* Handles cases where you're trying to modify the inner contents of * Handles cases where you're trying to modify the inner contents of
* a table, when you actually need to work with the tbody. * a table, when you actually need to work with the tbody.
*
* @member jQuery
* @param {String} expr The expression with which to filter
* @type Boolean
*/
is: function(expr) {
return jQuery.filter(expr,this.cur).r.length > 0;
},
/**
* A wrapper function for each() to be used by append and prepend.
* Handles cases where you're trying to modify the inner contents of
* a table, when you actually need to work with the tbody.
*
* @private
* @member jQuery
* @param {Function} fn The function doing the DOM manipulation.
* @type jQuery
*/ */
domManip: function(fn){ domManip: function(fn){
return this.each(function(){ return this.each(function(){
@ -276,9 +318,9 @@ jQuery.prototype = $.fn = {
} }
}; };
$.class = { jQuery.class = {
add: function(o,c){ add: function(o,c){
if ($.hasWord(o,c)) return; if (jQuery.hasWord(o,c)) return;
o.className += ( o.className.length > 0 ? " " : "" ) + c; o.className += ( o.className.length > 0 ? " " : "" ) + c;
}, },
remove: function(o,c){ remove: function(o,c){
@ -292,7 +334,7 @@ $.class = {
var b = navigator.userAgent.toLowerCase(); var b = navigator.userAgent.toLowerCase();
// Figure out what browser is being used // Figure out what browser is being used
$.browser = jQuery.browser =
( /webkit/.test(b) && "safari" ) || ( /webkit/.test(b) && "safari" ) ||
( /opera/.test(b) && "opera" ) || ( /opera/.test(b) && "opera" ) ||
( /msie/.test(b) && "msie" ) || ( /msie/.test(b) && "msie" ) ||
@ -300,25 +342,25 @@ $.class = {
"other"; "other";
// Check to see if the W3C box model is being used // Check to see if the W3C box model is being used
$.boxModel = ( $.browser != "msie" || document.compatMode == "CSS1Compat" ); jQuery.boxModel = ( jQuery.browser != "msie" || document.compatMode == "CSS1Compat" );
})(); })();
$.css = function(e,p) { jQuery.css = function(e,p) {
// Adapted from Prototype 1.4.0 // Adapted from Prototype 1.4.0
if ( p == "height" || p == "width" ) { if ( p == "height" || p == "width" ) {
// Handle extra width/height provided by the W3C box model // Handle extra width/height provided by the W3C box model
var ph = (!$.boxModel ? 0 : var ph = (!jQuery.boxModel ? 0 :
$.css(e,"paddingTop") + $.css(e,"paddingBottom") + jQuery.css(e,"paddingTop") + jQuery.css(e,"paddingBottom") +
$.css(e,"borderTopWidth") + $.css(e,"borderBottomWidth")) || 0; jQuery.css(e,"borderTopWidth") + jQuery.css(e,"borderBottomWidth")) || 0;
var pw = (!$.boxModel ? 0 : var pw = (!jQuery.boxModel ? 0 :
$.css(e,"paddingLeft") + $.css(e,"paddingRight") + jQuery.css(e,"paddingLeft") + jQuery.css(e,"paddingRight") +
$.css(e,"borderLeftWidth") + $.css(e,"borderRightWidth")) || 0; jQuery.css(e,"borderLeftWidth") + jQuery.css(e,"borderRightWidth")) || 0;
var oHeight, oWidth; var oHeight, oWidth;
if ($.css(e,"display") != 'none') { if (jQuery.css(e,"display") != 'none') {
oHeight = e.offsetHeight || parseInt(e.style.height) || 0; oHeight = e.offsetHeight || parseInt(e.style.height) || 0;
oWidth = e.offsetWidth || parseInt(e.style.width) || 0; oWidth = e.offsetWidth || parseInt(e.style.width) || 0;
} else { } else {
@ -356,7 +398,7 @@ $.css = function(e,p) {
return /top|right|left|bottom/i.test(p) ? parseFloat( r ) : r; return /top|right|left|bottom/i.test(p) ? parseFloat( r ) : r;
}; };
$.clean = function(a) { jQuery.clean = function(a) {
var r = []; var r = [];
for ( var i = 0; i < a.length; i++ ) { for ( var i = 0; i < a.length; i++ ) {
if ( a[i].constructor == String ) { if ( a[i].constructor == String ) {
@ -389,7 +431,7 @@ $.clean = function(a) {
return r; return r;
}; };
$.g = { jQuery.g = {
"": "m[2]== '*'||a.nodeName.toUpperCase()==m[2].toUpperCase()", "": "m[2]== '*'||a.nodeName.toUpperCase()==m[2].toUpperCase()",
"#": "a.getAttribute('id')&&a.getAttribute('id')==m[2]", "#": "a.getAttribute('id')&&a.getAttribute('id')==m[2]",
":": { ":": {
@ -401,47 +443,47 @@ $.g = {
last: "i==r.length-1", last: "i==r.length-1",
even: "i%2==0", even: "i%2==0",
odd: "i%2==1", odd: "i%2==1",
"first-child": "$.sibling(a,0).cur", "first-child": "jQuery.sibling(a,0).cur",
"nth-child": "(m[3]=='even'?$.sibling(a,m[3]).n%2==0:(m[3]=='odd'?$.sibling(a,m[3]).n%2==1:$.sibling(a,m[3]).cur))", "nth-child": "(m[3]=='even'?jQuery.sibling(a,m[3]).n%2==0:(m[3]=='odd'?jQuery.sibling(a,m[3]).n%2==1:jQuery.sibling(a,m[3]).cur))",
"last-child": "$.sibling(a,0,true).cur", "last-child": "jQuery.sibling(a,0,true).cur",
"nth-last-child": "$.sibling(a,m[3],true).cur", "nth-last-child": "jQuery.sibling(a,m[3],true).cur",
"first-of-type": "$.ofType(a,0)", "first-of-type": "jQuery.ofType(a,0)",
"nth-of-type": "$.ofType(a,m[3])", "nth-of-type": "jQuery.ofType(a,m[3])",
"last-of-type": "$.ofType(a,0,true)", "last-of-type": "jQuery.ofType(a,0,true)",
"nth-last-of-type": "$.ofType(a,m[3],true)", "nth-last-of-type": "jQuery.ofType(a,m[3],true)",
"only-of-type": "$.ofType(a)==1", "only-of-type": "jQuery.ofType(a)==1",
"only-child": "$.sibling(a).length==1", "only-child": "jQuery.sibling(a).length==1",
parent: "a.childNodes.length", parent: "a.childNodes.length",
empty: "!a.childNodes.length", empty: "!a.childNodes.length",
root: "a==(a.ownerDocument||document).documentElement", root: "a==(a.ownerDocument||document).documentElement",
contains: "(a.innerText||a.innerHTML).indexOf(m[3])!=-1", contains: "(a.innerText||a.innerHTML).indexOf(m[3])!=-1",
visible: "(!a.type||a.type!='hidden')&&($.css(a,'display')!= 'none'&&$.css(a,'visibility')!= 'hidden')", visible: "(!a.type||a.type!='hidden')&&(jQuery.css(a,'display')!= 'none'&&jQuery.css(a,'visibility')!= 'hidden')",
hidden: "(a.type&&a.type == 'hidden')||$.css(a,'display')=='none'||$.css(a,'visibility')== 'hidden'", hidden: "(a.type&&a.type == 'hidden')||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')== 'hidden'",
enabled: "a.disabled==false", enabled: "a.disabled==false",
disabled: "a.disabled", disabled: "a.disabled",
checked: "a.checked" checked: "a.checked"
}, },
".": "$.hasWord(a,m[2])", ".": "jQuery.hasWord(a,m[2])",
"@": { "@": {
"=": "$.attr(a,m[3])==m[4]", "=": "jQuery.attr(a,m[3])==m[4]",
"!=": "$.attr(a,m[3])!=m[4]", "!=": "jQuery.attr(a,m[3])!=m[4]",
"~=": "$.hasWord($.attr(a,m[3]),m[4])", "~=": "jQuery.hasWord(jQuery.attr(a,m[3]),m[4])",
"|=": "!$.attr(a,m[3]).indexOf(m[4])", "|=": "!jQuery.attr(a,m[3]).indexOf(m[4])",
"^=": "!$.attr(a,m[3]).indexOf(m[4])", "^=": "!jQuery.attr(a,m[3]).indexOf(m[4])",
"$=": "$.attr(a,m[3]).substr( $.attr(a,m[3]).length - m[4].length,m[4].length )==m[4]", "$=": "jQuery.attr(a,m[3]).substr( jQuery.attr(a,m[3]).length - m[4].length,m[4].length )==m[4]",
"*=": "$.attr(a,m[3]).indexOf(m[4])>=0", "*=": "jQuery.attr(a,m[3]).indexOf(m[4])>=0",
"": "m[3]=='*'?a.attributes.length>0:$.attr(a,m[3])" "": "m[3]=='*'?a.attributes.length>0:jQuery.attr(a,m[3])"
}, },
"[": "$.Select(m[2],a).length" "[": "jQuery.Select(m[2],a).length"
}; };
$.token = [ jQuery.token = [
"\\.\\.|/\\.\\.", "a.parentNode", "\\.\\.|/\\.\\.", "a.parentNode",
">|/", "$.sibling(a.firstChild)", ">|/", "jQuery.sibling(a.firstChild)",
"\\+", "$.sibling(a).next", "\\+", "jQuery.sibling(a).next",
"~", function(a){ "~", function(a){
var r = []; var r = [];
var s = $.sibling(a); var s = jQuery.sibling(a);
if ( s.n > 0 ) if ( s.n > 0 )
for ( var i = s.n; i < s.length; i++ ) for ( var i = s.n; i < s.length; i++ )
r[r.length] = s[i]; r[r.length] = s[i];
@ -449,8 +491,8 @@ $.token = [
} }
]; ];
$.Select = function( t, context ) { jQuery.Select = function( t, context ) {
context = context || $.context || document; context = context || jQuery.context || document;
if ( t.constructor != String ) return [t]; if ( t.constructor != String ) return [t];
if ( !t.indexOf("//") ) { if ( !t.indexOf("//") ) {
@ -472,17 +514,17 @@ $.Select = function( t, context ) {
var r = []; var r = [];
last = t; last = t;
t = $.cleanSpaces(t).replace( /^\/\//i, "" ); t = jQuery.cleanSpaces(t).replace( /^\/\//i, "" );
var foundToken = false; var foundToken = false;
for ( var i = 0; i < $.token.length; i += 2 ) { for ( var i = 0; i < jQuery.token.length; i += 2 ) {
var re = new RegExp("^(" + $.token[i] + ")"); var re = new RegExp("^(" + jQuery.token[i] + ")");
var m = re.exec(t); var m = re.exec(t);
if ( m ) { if ( m ) {
r = ret = $.map( ret, $.token[i+1] ); r = ret = jQuery.map( ret, jQuery.token[i+1] );
t = $.cleanSpaces( t.replace( re, "" ) ); t = jQuery.cleanSpaces( t.replace( re, "" ) );
foundToken = true; foundToken = true;
} }
} }
@ -491,7 +533,7 @@ $.Select = function( t, context ) {
if ( !t.indexOf(",") || !t.indexOf("|") ) { if ( !t.indexOf(",") || !t.indexOf("|") ) {
if ( ret[0] == context ) ret.shift(); if ( ret[0] == context ) ret.shift();
done = $.merge( done, ret ); done = jQuery.merge( done, ret );
r = ret = [context]; r = ret = [context];
t = " " + t.substr(1,t.length); t = " " + t.substr(1,t.length);
} else { } else {
@ -507,31 +549,41 @@ $.Select = function( t, context ) {
if ( !m[2] || m[1] == "." ) m[2] = "*"; if ( !m[2] || m[1] == "." ) m[2] = "*";
for ( var i = 0; i < ret.length; i++ ) for ( var i = 0; i < ret.length; i++ )
r = $.merge( r, $.tag(ret[i],m[2]) ); r = jQuery.merge( r,
m[2] == "*" ?
jQuery.getAll(ret[i]) :
ret[i].getElementsByTagName(m[2])
);
} }
} }
} }
if ( t ) { if ( t ) {
var val = $.filter(t,r); var val = jQuery.filter(t,r);
ret = r = val.r; ret = r = val.r;
t = $.cleanSpaces(val.t); t = jQuery.cleanSpaces(val.t);
} }
} }
if ( ret && ret[0] == context ) ret.shift(); if ( ret && ret[0] == context ) ret.shift();
done = $.merge( done, ret ); done = jQuery.merge( done, ret );
return done; return done;
}; };
$.tag = function(a,b){ jQuery.getAll = function(o,r) {
return a && a.getElementsByTagName != undefined ? r = r || [];
a.getElementsByTagName( b ) : []; var s = o.childNodes;
for ( var i = 0; i < s.length; i++ )
if ( s[i].nodeType == 1 ) {
r[r.length] = s[i];
jQuery.getAll( s[i], r );
}
return r;
}; };
$.attr = function(o,a,v){ jQuery.attr = function(o,a,v){
if ( a && a.constructor == String ) { if ( a && a.constructor == String ) {
var fix = { var fix = {
"for": "htmlFor", "for": "htmlFor",
@ -551,10 +603,10 @@ $.attr = function(o,a,v){
return ""; return "";
}; };
$.filter = function(t,r,not) { jQuery.filter = function(t,r,not) {
var g = $.grep; var g = jQuery.grep;
if ( not === false ) if ( not === false )
g = function(a,f) {return $.grep(a,f,true);}; g = function(a,f) {return jQuery.grep(a,f,true);};
while ( t && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) { while ( t && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) {
var re = /^\[ *@([a-z0-9*()_-]+) *([~!|*$^=]*) *'?"?([^'"]*)'?"? *\]/i; var re = /^\[ *@([a-z0-9*()_-]+) *([~!|*$^=]*) *'?"?([^'"]*)'?"? *\]/i;
@ -579,14 +631,14 @@ $.filter = function(t,r,not) {
t = t.replace( re, "" ); t = t.replace( re, "" );
if ( m[1] == ":" && m[2] == "not" ) if ( m[1] == ":" && m[2] == "not" )
r = $.filter(m[3],r,false).r; r = jQuery.filter(m[3],r,false).r;
else { else {
var f = null; var f = null;
if ( $.g[m[1]].constructor == String ) if ( jQuery.g[m[1]].constructor == String )
f = $.g[m[1]]; f = jQuery.g[m[1]];
else if ( $.g[m[1]][m[2]] ) else if ( jQuery.g[m[1]][m[2]] )
f = $.g[m[1]][m[2]]; f = jQuery.g[m[1]][m[2]];
if ( f ) { if ( f ) {
eval("f = function(a,i){return " + f + "}"); eval("f = function(a,i){return " + f + "}");
@ -598,7 +650,7 @@ $.filter = function(t,r,not) {
return { r: r, t: t }; return { r: r, t: t };
}; };
$.parents = function(a){ jQuery.parents = function(a){
var b = []; var b = [];
var c = a.parentNode; var c = a.parentNode;
while ( c && c != document ) { while ( c && c != document ) {
@ -608,17 +660,17 @@ $.parents = function(a){
return b; return b;
}; };
$.cleanSpaces = function(t){ jQuery.cleanSpaces = function(t){
return t.replace(/^\s+|\s+$/g, ""); return t.replace(/^\s+|\s+$/g, "");
}; };
$.ofType = function(a,n,e) { jQuery.ofType = function(a,n,e) {
var t = $.grep($.sibling(a),function(b){ return b.nodeName == a.nodeName; }); var t = jQuery.grep(jQuery.sibling(a),function(b){ return b.nodeName == a.nodeName; });
if ( e ) n = t.length - n - 1; if ( e ) n = t.length - n - 1;
return n != undefined ? t[n] == a : t.length; return n != undefined ? t[n] == a : t.length;
}; };
$.sibling = function(a,n,e) { jQuery.sibling = function(a,n,e) {
var type = []; var type = [];
var tmp = a.parentNode.childNodes; var tmp = a.parentNode.childNodes;
for ( var i = 0; i < tmp.length; i++ ) { for ( var i = 0; i < tmp.length; i++ ) {
@ -634,24 +686,13 @@ $.sibling = function(a,n,e) {
return type; return type;
}; };
$.hasWord = function(e,a) { jQuery.hasWord = function(e,a) {
if ( e == undefined ) return; if ( e == undefined ) return;
if ( e.className ) e = e.className; if ( e.className ) e = e.className;
return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e); return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e);
}; };
$.getAll = function(o,r) { jQuery.merge = function(a,b) {
r = r || [];
var s = o.childNodes;
for ( var i = 0; i < s.length; i++ )
if ( s[i].nodeType == 1 ) {
r[r.length] = s[i];
$.getAll( s[i], r );
}
return r;
};
$.merge = function(a,b) {
var d = []; var d = [];
for ( var k = 0; k < b.length; k++ ) d[k] = b[k]; for ( var k = 0; k < b.length; k++ ) d[k] = b[k];
@ -666,18 +707,18 @@ $.merge = function(a,b) {
return d; return d;
}; };
$.grep = function(a,f,s) { jQuery.grep = function(a,f,s) {
if ( f.constructor == String ) if ( f.constructor == String )
f = new Function("a","i","return " + f); f = new Function("a","i","return " + f);
var r = []; var r = [];
if ( a != undefined ) if ( a )
for ( var i = 0; i < a.length; i++ ) for ( var i = 0; i < a.length; i++ )
if ( (!s && f(a[i],i)) || (s && !f(a[i],i)) ) if ( (!s && f(a[i],i)) || (s && !f(a[i],i)) )
r[r.length] = a[i]; r[r.length] = a[i];
return r; return r;
}; };
$.map = function(a,f) { jQuery.map = function(a,f) {
if ( f.constructor == String ) if ( f.constructor == String )
f = new Function("a","return " + f); f = new Function("a","return " + f);
@ -686,23 +727,23 @@ $.map = function(a,f) {
var t = f(a[i],i); var t = f(a[i],i);
if ( t !== null ) { if ( t !== null ) {
if ( t.constructor != Array ) t = [t]; if ( t.constructor != Array ) t = [t];
r = $.merge( t, r ); r = jQuery.merge( t, r );
} }
} }
return r; return r;
}; };
$.event = { jQuery.event = {
// Bind an event to an element // Bind an event to an element
// Original by Dean Edwards // Original by Dean Edwards
add: function(element, type, handler) { add: function(element, type, handler) {
// For whatever reason, IE has trouble passing the window object // For whatever reason, IE has trouble passing the window object
// around, causing it to be cloned in the process // around, causing it to be cloned in the process
if ( $.browser == "msie" && element.setInterval != undefined ) if ( jQuery.browser == "msie" && element.setInterval != undefined )
element = window; element = window;
if (!handler.guid) handler.guid = $.event.guid++; if (!handler.guid) handler.guid = jQuery.event.guid++;
if (!element.events) element.events = {}; if (!element.events) element.events = {};
var handlers = element.events[type]; var handlers = element.events[type];
if (!handlers) { if (!handlers) {
@ -711,7 +752,7 @@ $.event = {
handlers[0] = element["on" + type]; handlers[0] = element["on" + type];
} }
handlers[handler.guid] = handler; handlers[handler.guid] = handler;
element["on" + type] = $.event.handle; element["on" + type] = jQuery.event.handle;
}, },
guid: 1, guid: 1,
@ -727,11 +768,11 @@ $.event = {
delete element.events[type][i]; delete element.events[type][i];
else else
for ( var j in element.events ) for ( var j in element.events )
$.event.remove( element, j ); jQuery.event.remove( element, j );
}, },
trigger: function(element,type,data) { trigger: function(element,type,data) {
data = data || [ $.event.fix({ type: type }) ]; data = data || [ jQuery.event.fix({ type: type }) ];
if ( element && element["on" + type] ) if ( element && element["on" + type] )
element["on" + type].apply( element, data ); element["on" + type].apply( element, data );
}, },
@ -740,7 +781,7 @@ $.event = {
if ( !event && !window.event ) return; if ( !event && !window.event ) return;
var returnValue = true, handlers = []; var returnValue = true, handlers = [];
event = event || $.event.fix(window.event); event = event || jQuery.event.fix(window.event);
for ( var j in this.events[event.type] ) for ( var j in this.events[event.type] )
handlers[handlers.length] = this.events[event.type][j]; handlers[handlers.length] = this.events[event.type][j];
@ -770,4 +811,4 @@ $.event = {
return event; return event;
} }
} };