X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=fdb488e98be82faac08b0b7861f84635cb8dab7a;hb=69efa31318238a1af5644da7aa5dc691dc33b376;hp=33d7c05c0496bc9f63ac8d6cc96fdb7ba0d39d58;hpb=94fc6aac1990dc3233c70f471432c5b9f230e756;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 33d7c05..fdb488e 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -26,12 +26,10 @@ window.undefined = window.undefined;
* @constructor
* @private
* @name jQuery
+ * @cat Core
*/
function jQuery(a,c) {
- // Initalize the extra macro functions
- if ( !jQuery.initDone ) jQuery.init();
-
// Shortcut for document ready (because $(document).each() is silly)
if ( a && a.constructor == Function && jQuery.fn.ready )
return jQuery(document).ready(a);
@@ -39,32 +37,13 @@ function jQuery(a,c) {
// Make sure that a selection was provided
a = a || jQuery.context || document;
- /*
- * Handle support for overriding other $() functions. Way too many libraries
- * provide this function to simply ignore it and overwrite it.
- */
- /*
- // Check to see if this is a possible collision case
- if ( jQuery._$ && !c && a.constructor == String &&
-
- // Make sure that the expression is a colliding one
- !/[^a-zA-Z0-9_-]/.test(a) &&
-
- // and that there are no elements that match it
- // (this is the one truly ambiguous case)
- !document.getElementsByTagName(a).length )
-
- // Use the default method, in case it works some voodoo
- return jQuery._$( a );
- */
-
// Watch for when a jQuery object is passed as the selector
if ( a.jquery )
- return $( jQuery.merge( a, [] ) );
+ return jQuery( jQuery.merge( a, [] ) );
// Watch for when a jQuery object is passed at the context
if ( c && c.jquery )
- return $( c ).find(a);
+ return jQuery( c ).find(a);
// If the context is global, return a new object
if ( window == this )
@@ -82,14 +61,119 @@ function jQuery(a,c) {
// Find the matching elements and save them for later
jQuery.find( a, c ) );
+ // See if an extra function was provided
var fn = arguments[ arguments.length - 1 ];
+
+ // If so, execute it in context
if ( fn && fn.constructor == Function )
this.each(fn);
}
// Map over the $ in case of overwrite
-if ( $ )
+if ( typeof $ != "undefined" )
jQuery._$ = $;
+
+/**
+ * This function accepts a string containing a CSS selector,
+ * basic XPath, or raw HTML, which is then used to match a set of elements.
+ * The HTML string is different from the traditional selectors in that
+ * it creates the DOM elements representing that HTML string, on the fly,
+ * to be (assumedly) inserted into the document later.
+ *
+ * The core functionality of jQuery centers around this function.
+ * Everything in jQuery is based upon this, or uses this in some way.
+ * The most basic use of this function is to pass in an expression
+ * (usually consisting of CSS or XPath), which then finds all matching
+ * elements and remembers them for later use.
+ *
+ * By default, $() looks for DOM elements within the context of the
+ * current HTML document.
+ *
+ * @example $("div > p")
+ * @desc This finds all p elements that are children of a div element.
+ * @before
one
two
three
+ * @result [
two
]
+ *
+ * @example $("
Hello
").appendTo("#body")
+ * @desc Creates a div element (and all of its contents) dynamically, and appends it to the element with the ID of body.
+ *
+ * @name $
+ * @param String expr An expression to search with, or a string of HTML to create on the fly.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * This function accepts a string containing a CSS selector, or
+ * basic XPath, which is then used to match a set of elements with the
+ * context of the specified DOM element, or document
+ *
+ * @example $("div", xml.responseXML)
+ * @desc This finds all div elements within the specified XML document.
+ *
+ * @name $
+ * @param String expr An expression to search with.
+ * @param Element context A DOM Element, or Document, representing the base context.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * Wrap jQuery functionality around a specific DOM Element.
+ * This function also accepts XML Documents and Window objects
+ * as valid arguments (even though they are not DOM Elements).
+ *
+ * @example $(document).find("div > p")
+ * @before
one
two
three
+ * @result [
two
]
+ *
+ * @example $(document).ready( loaded );
+ * @desc Executes the "loaded" function when the DOM is ready to
+ * be manipulated.
+ *
+ * @name $
+ * @param Element elem A DOM element to be encapsulated by a jQuery object.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * Wrap jQuery functionality around a set of DOM Elements.
+ *
+ * @example $( myForm.elements ).hide()
+ * @desc Hides all the input elements within a form
+ *
+ * @name $
+ * @param Array elems An array of DOM elements to be encapsulated by a jQuery object.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * A shorthand for $(document).ready(), allowing you to bind a function
+ * to be executed when the DOM document has finished loading.
+ *
+ * @example $( loaded )
+ * @desc Executes the function "loaded" when the DOM is ready to be used.
+ *
+ * @name $
+ * @param Function fn The function to execute when the DOM is ready.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * A means of creating a duplicate copy of a jQuery object.
+ *
+ * @example var div = $("div");
+ * $( div ).find("p")
+ * @desc Locates all p elements with all div elements, without disrupting the original jQuery object contained in 'div'.
+ *
+ * @name $
+ * @param jQuery obj The jQuery object to be cloned.
+ * @cat Core
+ * @type jQuery
+ */
// Map the jQuery namespace to the '$' one
var $ = jQuery;
@@ -196,7 +280,7 @@ jQuery.fn = jQuery.prototype = {
return num == undefined ?
// Return a 'clean' array
- jQuery.map( this, function(a){ return a } ) :
+ jQuery.merge( this, [] ) :
// Return just the object
this[num];
@@ -212,7 +296,15 @@ jQuery.fn = jQuery.prototype = {
* argument representing the position of the element in the matched
* set.
*
- * @example $("img").each(function(){ this.src = "test.jpg"; });
+ * @example $("img").each(function(){
+ * this.src = "test.jpg";
+ * });
+ * @before
+ * @result
+ *
+ * @example $("img").each(function(i){
+ * alert( "Image #" + i + " is " + this );
+ * });
* @before
* @result
*
@@ -389,8 +481,9 @@ jQuery.fn = jQuery.prototype = {
for ( var j = 0; j < e.length; j++ ) {
var r = e[j].childNodes;
for ( var i = 0; i < r.length; i++ )
- t += r[i].nodeType != 1 ?
- r[i].nodeValue : jQuery.fn.text([ r[i] ]);
+ if ( r[i].nodeType != 8 )
+ t += r[i].nodeType != 1 ?
+ r[i].nodeValue : jQuery.fn.text([ r[i] ]);
}
return t;
},
@@ -401,9 +494,30 @@ jQuery.fn = jQuery.prototype = {
* stucture into a document, without ruining the original semantic
* qualities of a document.
*
- * The way that is works is that it goes through the first element argument
- * provided and finds the deepest element within the structure - it is that
- * element that will en-wrap everything else.
+ * This works by going through the first element
+ * provided (which is generated, on the fly, from the provided HTML)
+ * and finds the deepest ancestor element within its
+ * structure - it is that element that will en-wrap everything else.
+ *
+ * @example $("p").wrap("");
+ * @before
Test Paragraph.
+ * @result
Test Paragraph.
+ *
+ * @name wrap
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and wrapped around the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Wrap all matched elements with a structure of other elements.
+ * This wrapping process is most useful for injecting additional
+ * stucture into a document, without ruining the original semantic
+ * qualities of a document.
+ *
+ * This works by going through the first element
+ * provided and finding the deepest ancestor element within its
+ * structure - it is that element that will en-wrap everything else.
*
* @example $("p").wrap("");
* @before
Test Paragraph.
@@ -411,10 +525,7 @@ jQuery.fn = jQuery.prototype = {
*
* @name wrap
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and wrapped around the target.
- * @any Element elem A DOM element that will be wrapped.
- * @any Array elems An array of elements, the first of which will be wrapped.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Element elem A DOM element that will be wrapped.
* @cat DOM/Manipulation
*/
wrap: function() {
@@ -439,7 +550,8 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * Append any number of elements to the inside of all matched elements.
+ * Append any number of elements to the inside of every matched elements,
+ * generated from the provided HTML.
* This operation is similar to doing an appendChild to all the
* specified elements, adding them into the document.
*
@@ -449,10 +561,37 @@ jQuery.fn = jQuery.prototype = {
*
* @name append
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and appended to the target.
- * @any Element elem A DOM element that will be appended.
- * @any Array elems An array of elements, all of which will be appended.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Append an element to the inside of all matched elements.
+ * This operation is similar to doing an appendChild to all the
+ * specified elements, adding them into the document.
+ *
+ * @example $("p").append( $("#foo")[0] );
+ * @before
I would like to say:
Hello
+ * @result
I would like to say: Hello
+ *
+ * @name append
+ * @type jQuery
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Append any number of elements to the inside of all matched elements.
+ * This operation is similar to doing an appendChild to all the
+ * specified elements, adding them into the document.
+ *
+ * @example $("p").append( $("b") );
+ * @before
I would like to say:
Hello
+ * @result
I would like to say: Hello
+ *
+ * @name append
+ * @type jQuery
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
append: function() {
@@ -462,20 +601,48 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * Prepend any number of elements to the inside of all matched elements.
+ * Prepend any number of elements to the inside of every matched elements,
+ * generated from the provided HTML.
+ * This operation is the best way to insert dynamically created elements
+ * inside, at the beginning, of all the matched element.
+ *
+ * @example $("p").prepend("Hello");
+ * @before
I would like to say:
+ * @result
HelloI would like to say:
+ *
+ * @name prepend
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Append an element to the inside of all matched elements.
+ * This operation is the best way to insert an element inside, at the
+ * beginning, of all the matched element.
+ *
+ * @example $("p").prepend( $("#foo")[0] );
+ * @before
I would like to say:
Hello
+ * @result
HelloI would like to say:
+ *
+ * @name prepend
+ * @type jQuery
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Append any number of elements to the inside of all matched elements.
* This operation is the best way to insert a set of elements inside, at the
* beginning, of all the matched element.
*
- * @example $("p").prepend("Hello");
- * @before
*
* @name prepend
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and prepended to the target.
- * @any Element elem A DOM element that will be prepended.
- * @any Array elems An array of elements, all of which will be prepended.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
prepend: function() {
@@ -485,18 +652,42 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * Insert any number of elements before each of the matched elements.
+ * Insert any number of dynamically generated elements before each of the
+ * matched elements.
*
* @example $("p").before("Hello");
- * @before
how are you?
- * @result Hello
how are you?
+ * @before
I would like to say:
+ * @result Hello
I would like to say:
+ *
+ * @name before
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Insert an element before each of the matched elements.
+ *
+ * @example $("p").before( $("#foo")[0] );
+ * @before
I would like to say:
Hello
+ * @result Hello
I would like to say:
*
* @name before
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and inserted.
- * @any Element elem A DOM element that will beinserted.
- * @any Array elems An array of elements, all of which will be inserted.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Insert any number of elements before each of the matched elements.
+ *
+ * @example $("p").before( $("b") );
+ * @before
I would like to say:
Hello
+ * @result Hello
I would like to say:
+ *
+ * @name before
+ * @type jQuery
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
before: function() {
@@ -506,18 +697,42 @@ jQuery.fn = jQuery.prototype = {
},
/**
+ * Insert any number of dynamically generated elements after each of the
+ * matched elements.
+ *
+ * @example $("p").after("Hello");
+ * @before
I would like to say:
+ * @result
I would like to say:
Hello
+ *
+ * @name after
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Insert an element after each of the matched elements.
+ *
+ * @example $("p").after( $("#foo")[0] );
+ * @before Hello
I would like to say:
+ * @result
I would like to say:
Hello
+ *
+ * @name after
+ * @type jQuery
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
+ /**
* Insert any number of elements after each of the matched elements.
*
- * @example $("p").after("
Hello
*
* @name after
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and inserted.
- * @any Element elem A DOM element that will beinserted.
- * @any Array elems An array of elements, all of which will be inserted.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
after: function() {
@@ -566,6 +781,21 @@ jQuery.fn = jQuery.prototype = {
}), arguments );
},
+ /**
+ * Create cloned copies of all matched DOM Elements. This does
+ * not create a cloned copy of this particular jQuery object,
+ * instead it creates duplicate copies of all DOM Elements.
+ * This is useful for moving copies of the elements to another
+ * location in the DOM.
+ *
+ * @example $("b").clone().prependTo("p");
+ * @before Hello
]
+ * @test cmpOK($("#main > p#ap > a").not("#google").length, "==", 2, ".not")
*
* @name not
* @type jQuery
@@ -685,7 +916,7 @@ jQuery.fn = jQuery.prototype = {
* @name add
* @type jQuery
* @param Array els An array of Elements to add
- * @cat jQuery
+ * @cat DOM/Traversing
*/
/**
@@ -699,7 +930,7 @@ jQuery.fn = jQuery.prototype = {
* @name add
* @type jQuery
* @param Element el An Element to add
- * @cat jQuery
+ * @cat DOM/Traversing
*/
add: function(t) {
return this.pushStack( jQuery.merge( this, t.constructor == String ?
@@ -714,7 +945,7 @@ jQuery.fn = jQuery.prototype = {
* @member jQuery
* @param {String} expr The expression with which to filter
* @type Boolean
- * @cat jQuery
+ * @cat DOM/Traversing
*/
is: function(expr) {
return expr ? jQuery.filter(expr,this).r.length > 0 : this.length > 0;
@@ -730,6 +961,7 @@ jQuery.fn = jQuery.prototype = {
* @param Number int
* @param Function fn The function doing the DOM manipulation.
* @type jQuery
+ * @cat Core
*/
domManip: function(args, table, dir, fn){
var clone = this.size() > 1;
@@ -763,6 +995,7 @@ jQuery.fn = jQuery.prototype = {
* @param Array a
* @param Array args
* @type jQuery
+ * @cat Core
*/
pushStack: function(a,args) {
var fn = args && args[args.length-1];
@@ -775,7 +1008,7 @@ jQuery.fn = jQuery.prototype = {
var old = this.get();
this.get( a );
if ( fn.constructor == Function )
- return this.each( fn );
+ this.each( fn );
this.get( old );
}
@@ -789,15 +1022,15 @@ jQuery.fn = jQuery.prototype = {
* @private
* @name extend
* @param Object obj
- * @param Object prop
* @type Object
+ * @cat Core
*/
/**
* Extend one object with another, returning the original,
* modified, object. This is a great utility for simple inheritance.
*
- * @name jQuery.extend
+ * @name $.extend
* @param Object obj The object to extend
* @param Object prop The object that will be merged into the first.
* @type Object
@@ -811,11 +1044,10 @@ jQuery.extend = jQuery.fn.extend = function(obj,prop) {
jQuery.extend({
/**
- *
- *
* @private
* @name init
* @type undefined
+ * @cat Core
*/
init: function(){
jQuery.initDone = true;
@@ -834,7 +1066,7 @@ jQuery.extend({
var a = arguments;
return this.each(function(){
for ( var j = 0; j < a.length; j++ )
- $(a[j])[n]( this );
+ jQuery(a[j])[n]( this );
});
};
});
@@ -874,7 +1106,7 @@ jQuery.extend({
* A generic iterator function, which can be used to seemlessly
* iterate over both objects and arrays.
*
- * @name jQuery.each
+ * @name $.each
* @param Object obj The object, or array, to iterate over.
* @param Object fn The function that will be executed on every object.
* @type Object
@@ -934,17 +1166,28 @@ jQuery.extend({
if (jQuery.css(e,"display") != "none") {
oHeight = e.offsetHeight;
oWidth = e.offsetWidth;
- } else
- jQuery.swap( e, { visibility: "hidden", position: "absolute", display: "block" },
- function(){
- oHeight = e.clientHeight;
- oWidth = e.clientWidth;
- });
+ } else {
+ e = jQuery(e.cloneNode(true)).css({
+ visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
+ }).appendTo(e.parentNode)[0];
+
+ var parPos = jQuery.css(e.parentNode,"position");
+ if ( parPos == "" || parPos == "static" )
+ e.parentNode.style.position = "relative";
+
+ oHeight = e.clientHeight;
+ oWidth = e.clientWidth;
+
+ if ( parPos == "" || parPos == "static" )
+ e.parentNode.style.position = "static";
+
+ e.parentNode.removeChild(e);
+ }
});
return p == "height" ? oHeight : oWidth;
} else if ( p == "opacity" && jQuery.browser.msie )
- return parseFloat( jQuery.curCSS(e,"filter").replace(/[^0-9.]/,"") ) || 1;
+ return parseFloat( jQuery.curCSS(e,"filter").replace(/[^0-9.]/,"") ) || 1;
return jQuery.curCSS( e, p );
},
@@ -958,8 +1201,8 @@ jQuery.extend({
} else if (elem.currentStyle) {
- var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase()});
- ret = elem.currentStyle[prop] || elem.currentStyle[np];
+ var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
+ ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
} else if (document.defaultView && document.defaultView.getComputedStyle) {
@@ -1033,6 +1276,7 @@ jQuery.extend({
odd: "i%2",
// Child Checks
+ "nth-child": "jQuery.sibling(a,m[3]).cur",
"first-child": "jQuery.sibling(a,0).cur",
"last-child": "jQuery.sibling(a,0).last",
"only-child": "jQuery.sibling(a).length==1",
@@ -1116,7 +1360,7 @@ jQuery.extend({
* @test t( "Adjacent", "p + p", ["ap","en","sap"] );
* @test t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
* @test t( "First Child", "p:first-child", ["firstp","sndp"] );
- * @test t( "Attribute Exists", "a[@title]", ["google"] );
+ * @test t( "Attribute Exists", "a[@title]", ["google"] );
* @test t( "Attribute Exists", "*[@title]", ["google"] );
* @test t( "Attribute Exists", "[@title]", ["google"] );
* @test t( "Attribute Equals", "a[@rel='bookmark']", ["simon1"] );
@@ -1168,8 +1412,10 @@ jQuery.extend({
* @test t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2"] );
* @test t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] );
*
- * @name jQuery.find
+ * @name $.find
+ * @type Array
* @private
+ * @cat Core
*/
find: function( t, context ) {
// Make sure that the context is a DOM Element
@@ -1205,6 +1451,8 @@ jQuery.extend({
var foundToken = false;
for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+ if ( foundToken ) continue;
+
var re = new RegExp("^(" + jQuery.token[i] + ")");
var m = re.exec(t);
@@ -1241,8 +1489,9 @@ jQuery.extend({
);
}
}
- }
+ }
+
if ( t ) {
var val = jQuery.filter(t,r);
ret = r = val.r;
@@ -1273,7 +1522,10 @@ jQuery.extend({
"class": "className",
"float": "cssFloat",
innerHTML: "innerHTML",
- className: "className"
+ className: "className",
+ value: "value",
+ disabled: "disabled",
+ checked: "checked"
};
if ( fix[name] ) {
@@ -1365,10 +1617,10 @@ jQuery.extend({
/**
* Remove the whitespace from the beginning and end of a string.
*
- * @private
- * @name jQuery.trim
+ * @name $.trim
* @type String
* @param String str The string to trim.
+ * @cat Javascript
*/
trim: function(t){
return t.replace(/^\s+|\s+$/g, "");
@@ -1378,9 +1630,10 @@ jQuery.extend({
* All ancestors of a given element.
*
* @private
- * @name jQuery.parents
+ * @name $.parents
* @type Array
* @param Element elem The element to find the ancestors of.
+ * @cat DOM/Traversing
*/
parents: function( elem ){
var matched = [];
@@ -1396,9 +1649,10 @@ jQuery.extend({
* All elements on a specified axis.
*
* @private
- * @name jQuery.sibling
+ * @name $.sibling
* @type Array
* @param Element elem The element to find all the siblings of (including itself).
+ * @cat DOM/Traversing
*/
sibling: function(elem, pos, not) {
var elems = [];
@@ -1424,11 +1678,11 @@ jQuery.extend({
/**
* Merge two arrays together, removing all duplicates.
*
- * @private
- * @name jQuery.merge
+ * @name $.merge
* @type Array
* @param Array a The first array to merge.
* @param Array b The second array to merge.
+ * @cat Javascript
*/
merge: function(first, second) {
var result = [];
@@ -1461,12 +1715,12 @@ jQuery.extend({
* in to this method will be passed two arguments: 'a' (which is the
* array item) and 'i' (which is the index of the item in the array).
*
- * @private
- * @name jQuery.grep
+ * @name $.grep
* @type Array
* @param Array array The Array to find items in.
* @param Function fn The function to process each item against.
* @param Boolean inv Invert the selection - select the opposite of the function.
+ * @cat Javascript
*/
grep: function(elems, fn, inv) {
// If a string is passed in for the function, make a function
@@ -1493,11 +1747,11 @@ jQuery.extend({
* from the array. Both of these changes imply that the size of the array may not
* be the same size upon completion, as it was when it started.
*
- * @private
- * @name jQuery.map
+ * @name $.map
* @type Array
* @param Array array The Array to translate.
* @param Function fn The function to process each item against.
+ * @cat Javascript
*/
map: function(elems, fn) {
// If a string is passed in for the function, make a function
@@ -1654,7 +1908,7 @@ new function() {
safari: /webkit/.test(b),
opera: /opera/.test(b),
msie: /msie/.test(b) && !/opera/.test(b),
- mozilla: /mozilla/.test(b) && !/compatible/.test(b)
+ mozilla: /mozilla/.test(b) && !/(compatible|webkit)/.test(b)
};
// Check to see if the W3C box model is being used
@@ -1944,8 +2198,8 @@ jQuery.macros = {
* Get the current CSS background of the first matched element.
*
* @example $("p").background();
- * @before
This is just a test.
- * @result ""
+ * @before
This is just a test.
+ * @result "blue"
*
* @name background
* @type String
@@ -1966,6 +2220,64 @@ jQuery.macros = {
*/
css: "width,height,top,left,position,float,overflow,color,background".split(","),
+
+ /**
+ * Reduce the set of matched elements to a single element.
+ * The position of the element in the set of matched elements
+ * starts at 0 and goes to length - 1.
+ *
+ * @example $("p").eq(1)
+ * @before
This is just a test.
So is this
+ * @result [
So is this
]
+ *
+ * @name eq
+ * @type jQuery
+ * @param Number pos The index of the element that you wish to limit to.
+ * @cat Core
+ */
+
+ /**
+ * Reduce the set of matched elements to all elements before a given position.
+ * The position of the element in the set of matched elements
+ * starts at 0 and goes to length - 1.
+ *
+ * @example $("p").lt(1)
+ * @before
This is just a test.
So is this
+ * @result [
This is just a test.
]
+ *
+ * @name lt
+ * @type jQuery
+ * @param Number pos Reduce the set to all elements below this position.
+ * @cat Core
+ */
+
+ /**
+ * Reduce the set of matched elements to all elements after a given position.
+ * The position of the element in the set of matched elements
+ * starts at 0 and goes to length - 1.
+ *
+ * @example $("p").gt(0)
+ * @before
This is just a test.
So is this
+ * @result [
So is this
]
+ *
+ * @name gt
+ * @type jQuery
+ * @param Number pos Reduce the set to all elements after this position.
+ * @cat Core
+ */
+
+ /**
+ * Filter the set of elements to those that contain the specified text.
+ *
+ * @example $("p").contains("test")
+ * @before
This is just a test.
So is this
+ * @result [
This is just a test.
]
+ *
+ * @name contains
+ * @type jQuery
+ * @param String str The string that will be contained within the text of an element.
+ * @cat DOM/Traversing
+ */
filter: [ "eq", "lt", "gt", "contains" ],
@@ -2218,7 +2530,7 @@ jQuery.macros = {
/**
* Get a set of elements containing the unique ancestors of the matched
- * set of elements.
+ * set of elements (except for the root element).
*
* @example $("span").ancestors()
* @before
Hello
Hello Again
@@ -2246,7 +2558,7 @@ jQuery.macros = {
/**
* Get a set of elements containing the unique ancestors of the matched
- * set of elements.
+ * set of elements (except for the root element).
*
* @example $("span").ancestors()
* @before
