Commit 9a96af1d authored by gnarf's avatar gnarf

Quick improvement to the performace of .index() with no arguments - Adding a...

Quick improvement to the performace of .index() with no arguments - Adding a unit test for .index() of a node without a parent returns -1
parent b43910a4
...@@ -145,12 +145,17 @@ jQuery.fn.extend({ ...@@ -145,12 +145,17 @@ jQuery.fn.extend({
// Determine the position of an element within // Determine the position of an element within
// the matched set of elements // the matched set of elements
index: function( elem ) { index: function( elem ) {
if ( !elem || typeof elem === "string" ) {
return jQuery.inArray( this[0], // No argument, return index in parent
// If it receives a string, the selector is used if ( !elem ) {
// If it receives nothing, the siblings are used return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
elem ? jQuery( elem ) : this.parent().children() ); }
// index in selector
if ( typeof elem === "string" ) {
return jQuery.inArray( this[0], jQuery( elem ) );
} }
// Locate the position of the desired element // Locate the position of the desired element
return jQuery.inArray( return jQuery.inArray(
// If it receives a jQuery object, the first element is used // If it receives a jQuery object, the first element is used
......
...@@ -99,9 +99,11 @@ test("is(jQuery)", function() { ...@@ -99,9 +99,11 @@ test("is(jQuery)", function() {
}); });
test("index()", function() { test("index()", function() {
expect(1); expect( 2 );
equals( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" ) equal( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" );
equal( jQuery("<div/>").index(), -1, "Node without parent returns -1" );
}); });
test("index(Object|String|undefined)", function() { test("index(Object|String|undefined)", function() {
......
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