Commit 9477c418 authored by John Resig's avatar John Resig

More bug fixes and added documentation - passes the test suite now.

parent df9c37ec
...@@ -5,7 +5,7 @@ ...@@ -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
*/ */
jQuery.prototype.load = function( url, params, callback ) { jQuery.fn.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 )
...@@ -52,159 +52,173 @@ jQuery.prototype.load = function( url, params, callback ) { ...@@ -52,159 +52,173 @@ jQuery.prototype.load = function( url, params, callback ) {
return this; return this;
}; };
/**
* Load a remote page using a GET request
*/
jQuery.get = function( url, callback, type ) {
// Build and start the HTTP Request
jQuery.ajax( "GET", url, null, function(r) {
if ( callback ) callback( jQuery.httpData(r,type) );
});
};
/**
* Load a remote page using a POST request.
*/
jQuery.post = function( url, data, callback, type ) {
// Build and start the HTTP Request
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 IE is used, create a wrapper for the XMLHttpRequest object
if ( jQuery.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.indexOf("MSIE 5") >= 0 ?
"Microsoft.XMLHTTP" : "Msxml2.XMLHTTP" "Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"
); );
}; };
// Attach a bunch of functions for handling common AJAX events // Attach a bunch of functions for handling common AJAX events
(function(){ new function(){
var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess".split(','); var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess".split(',');
for ( var i = 0; i < e.length; i++ ){ (function(){ for ( var i = 0; i < e.length; i++ ) new function(){
var o = e[i]; var o = e[i];
jQuery.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
*/
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 ) {
ret = type.complete;
var success = type.success;
var error = type.error;
data = type.data;
url = type.url;
type = type.type;
} }
}
// Watch for a new set of requests
if ( ! jQuery.ajax.active++ )
jQuery.event.trigger( "ajaxStart" );
// Create the request object jQuery.extend({
var xml = new XMLHttpRequest();
// Open the socket /**
xml.open(type || "GET", url, true); * Load a remote page using a GET request
*/
get: function( url, data, callback, type ) {
if ( data.constructor == Function ) {
callback = data;
data = null;
}
if ( data )
url += "?" + jQuery.param(data);
// Build and start the HTTP Request
jQuery.ajax( "GET", url, null, function(r) {
if ( callback ) callback( jQuery.httpData(r,type) );
});
},
// Set the correct header, if data is being sent /**
if ( data ) * Load a remote page using a POST request.
xml.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); */
post: function( url, data, callback, type ) {
// Set header so calling script knows that it's an XMLHttpRequest // Build and start the HTTP Request
xml.setRequestHeader("X-Requested-With", "XMLHttpRequest"); jQuery.ajax( "POST", url, jQuery.param(data), function(r) {
if ( callback ) callback( jQuery.httpData(r,type) );
// Make sure the browser sends the right content length });
if ( xml.overrideMimeType ) },
xml.setRequestHeader("Connection", "close");
/**
// Wait for a response to come back * A common wrapper for making XMLHttpRequests
xml.onreadystatechange = function(){ */
// The transfer is complete and the data is available ajax: function( type, url, data, ret ) {
if ( xml.readyState == 4 ) { // If only a single argument was passed in,
// Make sure that the request was successful // assume that it is a object of key/value pairs
if ( jQuery.httpSuccess( xml ) ) { if ( !url ) {
ret = type.complete;
// If a local callback was specified, fire it var success = type.success;
if ( success ) success( xml ); var error = type.error;
data = type.data;
url = type.url;
type = type.type;
}
// Watch for a new set of requests
if ( ! jQuery.active++ )
jQuery.event.trigger( "ajaxStart" );
// Create the request object
var xml = new XMLHttpRequest();
// Open the socket
xml.open(type || "GET", url, true);
// Set the correct header, if data is being sent
if ( data )
xml.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
// Set header so calling 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
xml.onreadystatechange = function(){
// The transfer is complete and the data is available
if ( xml.readyState == 4 ) {
// Make sure that the request was successful
if ( jQuery.httpSuccess( xml ) ) {
// Fire the global callback // If a local callback was specified, fire it
jQuery.event.trigger( "ajaxSuccess" ); if ( success ) success( xml );
// Otherwise, the request was not successful // Fire the global callback
} else { jQuery.event.trigger( "ajaxSuccess" );
// If a local callback was specified, fire it
if ( error ) error( xml );
// Fire the global callback // Otherwise, the request was not successful
jQuery.event.trigger( "ajaxError" ); } else {
// If a local callback was specified, fire it
if ( error ) error( xml );
// Fire the global callback
jQuery.event.trigger( "ajaxError" );
}
// The request was completed
jQuery.event.trigger( "ajaxComplete" );
// Handle the global AJAX counter
if ( ! --jQuery.active )
jQuery.event.trigger( "ajaxStop" );
// Process result
if ( ret ) ret(xml);
} }
// The request was completed
jQuery.event.trigger( "ajaxComplete" );
// Handle the global AJAX counter
if ( ! --jQuery.ajax.active )
jQuery.event.trigger( "ajaxStop" );
// Process result
if ( ret ) ret(xml);
} }
};
// Send the data
// Send the data xml.send(data);
xml.send(data); },
};
// Counter for holding the number of active queries
// Counter for holding the number of active queries 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) { try {
try { return r.status ?
return r.status ? ( r.status >= 200 && r.status < 300 ) || r.status == 304 :
( r.status >= 200 && r.status < 300 ) || r.status == 304 : location.protocol == "file:";
location.protocol == "file:"; } catch(e){}
} catch(e){} return false;
return false; },
};
// Get the data out of an XMLHttpRequest.
// Get the data out of an XMLHttpRequest. // Return parsed XML if content-type header is "xml" and type is "xml" or omitted,
// Return parsed XML if content-type header is "xml" and type is "xml" or omitted, // otherwise return plain text.
// otherwise return plain text. httpData: function(r,type) {
jQuery.httpData = function(r,type) { var ct = r.getResponseHeader("content-type");
var ct = r.getResponseHeader("content-type"); var xml = ( !type || type == "xml" ) && ct && ct.indexOf("xml") >= 0;
var xml = ( !type || type == "xml" ) && ct && ct.indexOf("xml") >= 0; return xml ? r.responseXML : r.responseText;
return xml ? r.responseXML : r.responseText; },
};
// 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
// of form elements
if ( a.constructor == Array )
// 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 // If an array was passed in, assume that it is an array
else // of form elements
// Serialize the key/values if ( a.constructor == Array )
for ( var j in a ) // Serialize the form elements
s.push( j + "=" + encodeURIComponent( a[j] ) ); for ( var i = 0; i < a.length; i++ )
s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) );
// Return the resulting serialization
return s.join("&"); // 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("&");
}
});
// We're overriding the old toggle function, so jQuery.fn.extend({
// remember it for later
jQuery.prototype._toggle = jQuery.prototype.toggle;
/** // We're overriding the old toggle function, so
* Toggle between two function calls every other click. // remember it for later
*/ _toggle: jQuery.fn.toggle,
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){
// Figure out which function to execute
this.last = this.last == a ? b : a;
// Make sure that clicks stop
e.preventDefault();
// and execute the function
return this.last.apply( this, [e] ) || false;
}) :
// Otherwise, execute the old toggle function /**
this._toggle(); * Toggle between two function calls every other click.
}; */
toggle: function(a,b) {
/** // If two functions are passed in, we're
* Toggle between two function calls on mouse over/out. // toggling on a click
*/ return a && b ? this.click(function(e){
jQuery.prototype.hover = function(f,g) { // Figure out which function to execute
this.last = this.last == a ? b : a;
// A private function for haandling mouse 'hovering'
function handleHover(e) { // Make sure that clicks stop
// Check if mouse(over|out) are still within the same parent element e.preventDefault();
var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
// and execute the function
// Traverse up the tree return this.last.apply( this, [e] ) || false;
while ( p && p != this ) p = p.parentNode; }) :
// If we actually just moused on to a sub-element, ignore it // Otherwise, execute the old toggle function
if ( p == this ) return false; this._toggle();
},
/**
* Toggle between two function calls on mouse over/out.
*/
hover: function(f,g) {
// Execute the right function // A private function for haandling mouse 'hovering'
return (e.type == "mouseover" ? f : g).apply(this, [e]); function handleHover(e) {
} // Check if mouse(over|out) are still within the same parent element
var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
// Bind the function to the two event listeners // Traverse up the tree
return this.mouseover(handleHover).mouseout(handleHover); while ( p && p != this ) p = p.parentNode;
};
// If we actually just moused on to a sub-element, ignore it
/** if ( p == this ) return false;
* Bind a function to fire when the DOM is ready.
*/ // Execute the right function
jQuery.prototype.ready = function(f) { return (e.type == "mouseover" ? f : g).apply(this, [e]);
// If the DOM is already ready }
if ( jQuery.isReady )
// Execute the function immediately
f.apply( document );
// Otherwise, remember the function for later // Bind the function to the two event listeners
else { return this.mouseover(handleHover).mouseout(handleHover);
// Add the function to the wait list },
jQuery.readyList.push( f );
/**
* Bind a function to fire when the DOM is ready.
*/
ready: function(f) {
// If the DOM is already ready
if ( jQuery.isReady )
// Execute the function immediately
f.apply( document );
// Otherwise, remember the function for later
else {
// Add the function to the wait list
jQuery.readyList.push( f );
}
return this;
} }
});
return this; jQuery.extend({
}; /*
* All the code that makes DOM Ready work nicely.
*/
isReady: false,
readyList: [],
// Handle when the DOM is ready
ready: function() {
// Make sure that the DOM is not already loaded
if ( !jQuery.isReady ) {
// Remember that the DOM is ready
jQuery.isReady = true;
// If there are functions bound, to execute
if ( jQuery.readyList ) {
// Execute all of them
for ( var i = 0; i < jQuery.readyList.length; i++ )
jQuery.readyList[i].apply( document );
// Reset the list of functions
jQuery.readyList = null;
}
}
}
});
(function(){ new function(){
/* /*
* Bind a number of event-handling functions, dynamically * Bind a number of event-handling functions, dynamically
*/ */
var e = ("blur,focus,contextmenu,load,resize,scroll,unload,click,dblclick," + var e = ("blur,focus,load,resize,scroll,unload,click,dblclick," +
"mousedown,mouseup,mouseenter,mouseleave,mousemove,mouseover,mouseout," + "mousedown,mouseup,mousemove,mouseover,mouseout,change,reset,select," +
"change,reset,select,submit,keydown,keypress,keyup").split(","); "submit,keydown,keypress,keyup,error").split(",");
// Go through all the event names, but make sure that // Go through all the event names, but make sure that
// it is enclosed properly // it is enclosed properly
for ( var i = 0; i < e.length; i++ ) {(function(){ for ( var i = 0; i < e.length; i++ ) new function(){
var o = e[i]; var o = e[i];
// Handle event binding // Handle event binding
jQuery.prototype[o] = function(f){ return this.bind(o, f); }; jQuery.fn[o] = function(f){
return f ? this.bind(o, f) : this.trigger(o);
};
// Handle event unbinding // Handle event unbinding
jQuery.prototype["un"+o] = function(f){ return this.unbind(o, f); }; jQuery.fn["un"+o] = function(f){ return this.unbind(o, f); };
// Handle event triggering
jQuery.prototype["do"+o] = function(){ return this.trigger(o); };
// Finally, handle events that only fire once // Finally, handle events that only fire once
jQuery.prototype["one"+o] = function(f){ jQuery.fn["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
// If this function has already been executed, stop // If this function has already been executed, stop
if ( this[o+f] !== null ) if ( this[o+f] !== null ) return;
return true;
// Otherwise, mark as having been executed // Otherwise, mark as having been executed
this[o+f]++; this[o+f]++;
...@@ -106,42 +134,16 @@ jQuery.prototype.ready = function(f) { ...@@ -106,42 +134,16 @@ jQuery.prototype.ready = function(f) {
}); });
}; };
})();} }
/*
* All the code that makes DOM Ready work nicely.
*/
jQuery.isReady = false;
jQuery.readyList = [];
// Handle when the DOM is ready
jQuery.ready = function() {
// Make sure that the DOM is not already loaded
if ( !jQuery.isReady ) {
// Remember that the DOM is ready
jQuery.isReady = true;
// If there are functions bound, to execute
if ( jQuery.readyList ) {
// Execute all of them
for ( var i = 0; i < jQuery.readyList.length; i++ )
jQuery.readyList[i].apply( document );
// Reset the list of functions
jQuery.readyList = null;
}
}
};
// If Mozilla is used // If Mozilla is used
if ( jQuery.browser == "mozilla" || jQuery.browser == "opera" ) { if ( jQuery.browser.mozilla || jQuery.browser.opera ) {
// Use the handy event callback // Use the handy event callback
document.addEventListener( "DOMContentLoaded", jQuery.ready, false ); document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
// 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 ( jQuery.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 " +
...@@ -158,7 +160,7 @@ jQuery.prototype.ready = function(f) { ...@@ -158,7 +160,7 @@ jQuery.prototype.ready = function(f) {
script = null; script = null;
// If Safari is used // If Safari is used
} else if ( jQuery.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
jQuery.safariTimer = setInterval(function(){ jQuery.safariTimer = setInterval(function(){
// loaded and complete are both valid states // loaded and complete are both valid states
...@@ -178,4 +180,4 @@ jQuery.prototype.ready = function(f) { ...@@ -178,4 +180,4 @@ jQuery.prototype.ready = function(f) {
// A fallback to window.onload, that will always work // A fallback to window.onload, that will always work
jQuery.event.add( window, "load", jQuery.ready ); jQuery.event.add( window, "load", jQuery.ready );
})(); }
// overwrite the old show method jQuery.fn.extend({
jQuery.prototype._show = jQuery.prototype.show;
/** // overwrite the old show method
* The effects module overloads the show method to now allow _show: jQuery.fn.show,
* for a speed to the show operation. What actually happens is
* that the height, width, and opacity to the matched elements /**
* are changed dynamically. The only three current speeds are * The effects module overloads the show method to now allow
* "slow", "normal", and "fast". For example: * for a speed to the show operation. What actually happens is
* $("p").show("slow"); * that the height, width, and opacity to the matched elements
* Note: You should not run the show method on things * are changed dynamically. The only three current speeds are
* that are already shown. This can be circumvented by doing this: * "slow", "normal", and "fast". For example:
* $("p:hidden").show("slow"); * $("p").show("slow");
*/ * Note: You should not run the show method on things
jQuery.prototype.show = function(speed,callback){ * that are already shown. This can be circumvented by doing this:
return speed ? this.animate({ * $("p:hidden").show("slow");
height: "show", width: "show", opacity: "show" */
}, speed, callback) : this._show(); show: function(speed,callback){
}; return speed ? this.animate({
height: "show", width: "show", opacity: "show"
// We're overwriting the old hide method }, speed, callback) : this._show();
jQuery.prototype._hide = jQuery.prototype.hide; },
// We're overwriting the old hide method
/** _hide: jQuery.fn.hide,
* The hide function behaves very similary to the show function,
* but is just the opposite. /**
* $("p:visible").hide("slow"); * The hide function behaves very similary to the show function,
*/ * but is just the opposite.
jQuery.prototype.hide = function(speed,callback){ * $("p:visible").hide("slow");
return speed ? this.animate({ */
height: "hide", hide: function(speed,callback){
width: "hide", return speed ? this.animate({
opacity: "hide" height: "hide", width: "hide", opacity: "hide"
}, speed, callback) : this._hide(); }, speed, callback) : this._hide();
}; },
/** /**
* This function increases the height and opacity for all matched * This function increases the height and opacity for all matched
* elements. This is very similar to 'show', but does not change * elements. This is very similar to 'show', but does not change
* the width - creating a neat sliding effect. * the width - creating a neat sliding effect.
* $("p:hidden").slideDown("slow"); * $("p:hidden").slideDown("slow");
*/ */
jQuery.prototype.slideDown = function(speed,callback){ slideDown: function(speed,callback){
return this.animate({height: "show"}, speed, callback); return this.animate({height: "show"}, 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");
*/ */
jQuery.prototype.slideUp = function(speed,callback){ slideUp: function(speed,callback){
return this.animate({height: "hide"}, speed, callback); return this.animate({height: "hide"}, speed, callback);
}; },
/** /**
* Adjusts the opacity of all matched elements from a hidden, * Adjusts the opacity of all matched elements from a hidden,
* to a fully visible, state. * to a fully visible, state.
* $("p:hidden").fadeIn("slow"); * $("p:hidden").fadeIn("slow");
*/ */
jQuery.prototype.fadeIn = function(speed,callback){ fadeIn: function(speed,callback){
return this.animate({opacity: "show"}, speed, callback); return this.animate({opacity: "show"}, 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");
*/ */
jQuery.prototype.fadeOut = function(speed,callback){ fadeOut: function(speed,callback){
return this.animate({opacity: "hide"}, speed, callback); return this.animate({opacity: "hide"}, speed, callback);
}; },
/** /**
* ... * ...
*/ */
jQuery.prototype.fadeTo = function(speed,to,callback){ fadeTo: function(speed,to,callback){
return this.animate({opacity: to}, speed, callback); return this.animate({opacity: to}, speed, callback);
}; },
/** /**
* *
*/ */
jQuery.prototype.animate = function(prop,speed,callback) { 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 jQuery.fx( this, jQuery.speed(speed,callback,i++), p ); var e = new jQuery.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
e[ prop[p] ](); e[ prop[p] ]();
}
});
},
/**
*
* @private
*/
queue: function(type,fn){
if ( !fn ) {
fn = type;
type = "fx";
} }
});
};
jQuery.speed = function(s,o,i) {
o = o || {};
if ( o.constructor == Function ) return this.each(function(){
o = { complete: o }; if ( !this.queue )
this.queue = {};
var ss = {"slow":600,"fast":200}; if ( !this.queue[type] )
o.duration = (s && s.constructor == Number ? s : ss[s]) || 400; this.queue[type] = [];
// Queueing
o.oldComplete = o.complete;
o.complete = function(){
jQuery.dequeue(this, "fx");
if ( o.oldComplete && o.oldComplete.constructor == Function )
o.oldComplete.apply( this );
};
if ( i > 0 )
o.complete = null;
return o;
};
jQuery.queue = {};
jQuery.dequeue = function(elem,type){
type = type || "fx";
if ( elem.queue && elem.queue[type] ) {
// Remove self
elem.queue[type].shift();
// Get next function
var f = elem.queue[type][0];
if ( f ) this.queue[type].push( fn );
f.apply( elem );
} if ( this.queue[type].length == 1 )
}; fn.apply(this);
});
jQuery.prototype.queue = function(type,fn){
if ( !fn ) {
fn = type;
type = "fx";
} }
return this.each(function(){ });
if ( !this.queue )
this.queue = {};
if ( !this.queue[type] ) jQuery.extend({
this.queue[type] = [];
this.queue[type].push( fn ); setAuto: function(e,p) {
var a = e.style[p];
var o = jQuery.css(e,p);
e.style[p] = "auto";
var n = jQuery.css(e,p);
if ( o != n )
e.style[p] = a;
},
if ( this.queue[type].length == 1 ) speed: function(s,o,i) {
fn.apply(this); o = o || {};
});
}; if ( o.constructor == Function )
o = { complete: o };
jQuery.setAuto = function(e,p) {
var a = e.style[p]; var ss = { slow: 600, fast: 200 };
var o = jQuery.css(e,p); o.duration = (s && s.constructor == Number ? s : ss[s]) || 400;
e.style[p] = "auto";
var n = jQuery.css(e,p); // Queueing
if ( o != n ) o.oldComplete = o.complete;
e.style[p] = a; o.complete = function(){
}; jQuery.dequeue(this, "fx");
if ( o.oldComplete && o.oldComplete.constructor == Function )
/* o.oldComplete.apply( this );
* I originally wrote fx() as a clone of moo.fx and in the process };
* of making it small in size the code became illegible to sane
* people. You've been warned. if ( i > 0 )
*/ o.complete = null;
jQuery.fx = function( elem, options, prop ){ return o;
},
var z = this;
queue: {},
// The users options
z.o = { dequeue: function(elem,type){
duration: options.duration || 400, type = type || "fx";
complete: options.complete
}; if ( elem.queue && elem.queue[type] ) {
// Remove self
// The element elem.queue[type].shift();
z.el = elem;
// Get next function
// The styles var f = elem.queue[type][0];
var y = z.el.style;
if ( f )
// Simple function for setting a style value f.apply( elem );
z.a = function(){ }
if ( prop == "opacity" ) { },
if (z.now == 1) z.now = 0.9999;
if (window.ActiveXObject)
y.filter = "alpha(opacity=" + z.now*100 + ")";
y.opacity = z.now;
} else
y[prop] = z.now+"px";
};
// Figure out the maximum number to run to
z.max = function(){
return z.el["orig"+prop] || z.cur();
};
// Get the current size
z.cur = function(){
return parseFloat( jQuery.css(z.el,prop) );
};
// Start an animation from one number to another
z.custom = function(from,to){
z.startTime = (new Date()).getTime();
z.now = from;
z.a();
z.timer = setInterval(function(){
z.step(from, to);
}, 13);
};
// Simple 'show' function
z.show = function(){
y.display = "block";
z.o.auto = true;
z.custom(0,z.max());
};
// Simple 'hide' function
z.hide = function(){
// Remember where we started, so that we can go back to it later
z.el["orig"+prop] = this.cur();
// Begin the animation
z.custom(z.cur(),0);
};
// IE has trouble with opacity if it doesn't have layout
if ( jQuery.browser == "msie" && !z.el.currentStyle.hasLayout )
y.zoom = 1;
// Remember the overflow of the element
z.oldOverflow = y.overflow;
// Make sure that nothing sneaks out
y.overflow = "hidden";
// Each step of an animation
z.step = function(firstNum, lastNum){
var t = (new Date()).getTime();
if (t > z.o.duration + z.startTime) {
// Stop the timer
clearInterval(z.timer);
z.timer = null;
z.now = lastNum; /*
* I originally wrote fx() as a clone of moo.fx and in the process
* of making it small in size the code became illegible to sane
* people. You've been warned.
*/
fx: function( elem, options, prop ){
var z = this;
// The users options
z.o = {
duration: options.duration || 400,
complete: options.complete
};
// The element
z.el = elem;
// The styles
var y = z.el.style;
// Simple function for setting a style value
z.a = function(){
if ( prop == "opacity" ) {
if (z.now == 1) z.now = 0.9999;
if (window.ActiveXObject)
y.filter = "alpha(opacity=" + z.now*100 + ")";
y.opacity = z.now;
} else
y[prop] = z.now+"px";
};
// Figure out the maximum number to run to
z.max = function(){
return z.el["orig"+prop] || z.cur();
};
// Get the current size
z.cur = function(){
return parseFloat( jQuery.css(z.el,prop) );
};
// Start an animation from one number to another
z.custom = function(from,to){
z.startTime = (new Date()).getTime();
z.now = from;
z.a(); z.a();
// Reset the overflow z.timer = setInterval(function(){
y.overflow = z.oldOverflow; z.step(from, to);
}, 13);
// If the element was shown, and not using a custom number, };
// set its height and/or width to auto
if ( (prop == "height" || prop == "width") && z.o.auto ) // Simple 'show' function
jQuery.setAuto( z.el, prop ); z.show = function(){
y.display = "block";
// If a callback was provided, execute it z.o.auto = true;
if( z.o.complete && z.o.complete.constructor == Function ) { z.custom(0,z.max());
};
// Yes, this is a weird place for this, but it needs to be executed
// only once per cluster of effects. // Simple 'hide' function
// If the element is, effectively, hidden - hide it z.hide = function(){
if ( y.height == "0px" || y.width == "0px" ) // Remember where we started, so that we can go back to it later
y.display = "none"; z.el["orig"+prop] = this.cur();
// Execute the complete function // Begin the animation
z.o.complete.apply( z.el ); z.custom(z.cur(),0);
};
// IE has trouble with opacity if it doesn't have layout
if ( jQuery.browser.msie && !z.el.currentStyle.hasLayout )
y.zoom = 1;
// Remember the overflow of the element
z.oldOverflow = y.overflow;
// Make sure that nothing sneaks out
y.overflow = "hidden";
// Each step of an animation
z.step = function(firstNum, lastNum){
var t = (new Date()).getTime();
if (t > z.o.duration + z.startTime) {
// Stop the timer
clearInterval(z.timer);
z.timer = null;
z.now = lastNum;
z.a();
// Reset the overflow
y.overflow = z.oldOverflow;
// If the element was shown, and not using a custom number,
// set its height and/or width to auto
if ( (prop == "height" || prop == "width") && z.o.auto )
jQuery.setAuto( z.el, prop );
// If a callback was provided, execute it
if( z.o.complete && z.o.complete.constructor == Function ) {
// Yes, this is a weird place for this, but it needs to be executed
// only once per cluster of effects.
// If the element is, effectively, hidden - hide it
if ( y.height == "0px" || y.width == "0px" )
y.display = "none";
// Execute the complete function
z.o.complete.apply( z.el );
}
} else {
// Figure out where in the animation we are and set the number
var p = (t - this.startTime) / z.o.duration;
z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
// Perform the next step of the animation
z.a();
} }
} else { };
// Figure out where in the animation we are and set the number
var p = (t - this.startTime) / z.o.duration; }
z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
// Perform the next step of the animation
z.a();
}
};
}; });
...@@ -457,9 +457,9 @@ jQuery.fn = jQuery.prototype = { ...@@ -457,9 +457,9 @@ jQuery.fn = jQuery.prototype = {
}, },
/** /**
* End all 'destructive' operations, reverting the list of matched elements. * End the most recent 'destructive' operation, reverting the list of matched elements
* After an end operation, the list of matched elements will revert to the last * back to its previous state. After an end operation, the list of matched elements will
* state of matched elements. * revert to the last state of matched elements.
* *
* @example $("p").find("span").end(); * @example $("p").find("span").end();
* @before <p><span>Hello</span>, how are you?</p> * @before <p><span>Hello</span>, how are you?</p>
...@@ -472,6 +472,22 @@ jQuery.fn = jQuery.prototype = { ...@@ -472,6 +472,22 @@ jQuery.fn = jQuery.prototype = {
return this.get( this.stack.pop() ); return this.get( this.stack.pop() );
}, },
/**
* Searches for all elements that match the specified expression.
* This method is the optimal way of finding additional descendant
* elements with which to process.
*
* All searching is done using a jQuery expression. The expression can be
* written using CSS 1-3 Selector sytax, or basic XPath.
*
* @example $("p").find("span");
* @before <p><span>Hello</span>, how are you?</p>
* @result $("p").find("span") == [ <span>Hello</span> ]
*
* @name find
* @type jQuery
* @param String expr An expression to search with.
*/
find: function(t) { find: function(t) {
return this.pushStack( jQuery.map( this, function(a){ return this.pushStack( jQuery.map( this, function(a){
return jQuery.find(t,a); return jQuery.find(t,a);
...@@ -515,7 +531,7 @@ jQuery.fn = jQuery.prototype = { ...@@ -515,7 +531,7 @@ jQuery.fn = jQuery.prototype = {
}, },
/** /**
* :-P *
* *
* @private * @private
* @name domManip * @name domManip
...@@ -926,7 +942,7 @@ jQuery.extend({ ...@@ -926,7 +942,7 @@ jQuery.extend({
if ( m ) { if ( m ) {
r = ret = jQuery.map( ret, jQuery.token[i+1] ); r = ret = jQuery.map( ret, jQuery.token[i+1] );
t = jQuery.trim(t).replace( re, "" ); t = jQuery.trim( t.replace( re, "" ) );
foundToken = true; foundToken = true;
} }
} }
...@@ -1058,10 +1074,14 @@ jQuery.extend({ ...@@ -1058,10 +1074,14 @@ jQuery.extend({
// Otherwise, find the expression to execute // Otherwise, find the expression to execute
else { else {
var f = jQuery.expr[m[1]];
if ( f.constructor != String )
f = jQuery.expr[m[1]][m[2]];
// Build a custom macro to enclose it // Build a custom macro to enclose it
eval("f = function(a,i){" + eval("f = function(a,i){" +
( m[1] == "@" ? "z=jQuery.attr(a,m[3]);" : "" ) + ( m[1] == "@" ? "z=jQuery.attr(a,m[3]);" : "" ) +
"return " + jQuery.expr[m[1]] + "}"); "return " + f + "}");
// Execute it against the current filter // Execute it against the current filter
r = g( r, f ); r = g( r, f );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment