Skip to content
Permalink
Browse files

Moved some methods around inbetween core.js and traversing.js. Core m…

…ethods shouldn't rely upon other modules (e.g. the selector engine) wherever possible.
  • Loading branch information
jeresig committed Dec 10, 2009
1 parent ede2f2c commit 474d814076963f41157c0054448984c00fd46c1b
Showing with 164 additions and 164 deletions.
  1. +29 −19 src/core.js
  2. +19 −29 src/traversing.js
  3. +79 −31 test/unit/core.js
  4. +37 −85 test/unit/traversing.js
@@ -210,25 +210,6 @@ jQuery.fn = jQuery.prototype = {
each: function( callback, args ) {
return jQuery.each( this, callback, args );
},

// Determine the position of an element within
// the matched set of elements
index: function( elem ) {
if ( !elem || typeof elem === "string" ) {
return jQuery.inArray( this[0],
// If it receives a string, the selector is used
// If it receives nothing, the siblings are used
elem ? jQuery( elem ) : this.parent().children() );
}
// Locate the position of the desired element
return jQuery.inArray(
// If it receives a jQuery object, the first element is used
elem.jquery ? elem[0] : elem, this );
},

is: function( selector ) {
return !!selector && jQuery.filter( selector, this ).length > 0;
},

ready: function( fn ) {
// Attach the listeners
@@ -247,6 +228,35 @@ jQuery.fn = jQuery.prototype = {

return this;
},

eq: function( i ) {
return i === -1 ?
this.slice( i ) :
this.slice( i, +i + 1 );
},

first: function() {
return this.eq( 0 );
},

last: function() {
return this.eq( -1 );
},

slice: function() {
return this.pushStack( slice.apply( this, arguments ),
"slice", slice.call(arguments).join(",") );
},

map: function( callback ) {
return this.pushStack( jQuery.map(this, function(elem, i){
return callback.call( elem, i, elem );
}));
},

end: function() {
return this.prevObject || jQuery(null);
},

// For internal use only.
// Behaves like an Array's method, not like a jQuery method.
@@ -79,6 +79,10 @@ jQuery.fn.extend({
filter: function( selector ) {
return this.pushStack( winnow(this, selector, true), "filter", selector );
},

is: function( selector ) {
return !!selector && jQuery.filter( selector, this ).length > 0;
},

closest: function( selectors, context ) {
if ( jQuery.isArray( selectors ) ) {
@@ -124,6 +128,21 @@ jQuery.fn.extend({
return null;
});
},

// Determine the position of an element within
// the matched set of elements
index: function( elem ) {
if ( !elem || typeof elem === "string" ) {
return jQuery.inArray( this[0],
// If it receives a string, the selector is used
// If it receives nothing, the siblings are used
elem ? jQuery( elem ) : this.parent().children() );
}
// Locate the position of the desired element
return jQuery.inArray(
// If it receives a jQuery object, the first element is used
elem.jquery ? elem[0] : elem, this );
},

add: function( selector, context ) {
var set = typeof selector === "string" ?
@@ -136,37 +155,8 @@ jQuery.fn.extend({
all );
},

eq: function( i ) {
return i === -1 ?
this.slice( i ) :
this.slice( i, +i + 1 );
},

first: function() {
return this.eq( 0 );
},

last: function() {
return this.eq( -1 );
},

slice: function() {
return this.pushStack( slice.apply( this, arguments ),
"slice", slice.call(arguments).join(",") );
},

map: function( callback ) {
return this.pushStack( jQuery.map(this, function(elem, i){
return callback.call( elem, i, elem );
}));
},

andSelf: function() {
return this.add( this.prevObject );
},

end: function() {
return this.prevObject || jQuery(null);
}
});

@@ -423,6 +423,16 @@ test("jQuery(selector, xml).text(str) - Loaded via XML document", function() {
});
}

test("end()", function() {
expect(3);
equals( 'Yahoo', jQuery('#yahoo').parent().end().text(), 'Check for end' );
ok( jQuery('#yahoo').end(), 'Check for end with nothing to end' );

var x = jQuery('#yahoo');
x.parent();
equals( 'Yahoo', jQuery('#yahoo').text(), 'Check for non-destructive behaviour' );
});

test("length", function() {
expect(1);
equals( jQuery("p").length, 6, "Get Number of Elements Found" );
@@ -518,41 +528,79 @@ test("each(Function)", function() {
ok( pass, "Execute a function, Relative" );
});

test("index()", function() {
expect(1);
test("slice()", function() {
expect(7);

var $links = jQuery("#ap a");

equals( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" )
same( $links.slice(1,2).get(), q("groups"), "slice(1,2)" );
same( $links.slice(1).get(), q("groups", "anchor1", "mark"), "slice(1)" );
same( $links.slice(0,3).get(), q("google", "groups", "anchor1"), "slice(0,3)" );
same( $links.slice(-1).get(), q("mark"), "slice(-1)" );

same( $links.eq(1).get(), q("groups"), "eq(1)" );
same( $links.eq('2').get(), q("anchor1"), "eq('2')" );
same( $links.eq(-1).get(), q("mark"), "eq(-1)" );
});

test("index(Object|String|undefined)", function() {
expect(16);
test("first()/last()", function() {
expect(4);

var $links = jQuery("#ap a"), $none = jQuery("asdf");

same( $links.first().get(), q("google"), "first()" );
same( $links.last().get(), q("mark"), "last()" );

same( $none.first().get(), [], "first() none" );
same( $none.last().get(), [], "last() none" );
});

test("map()", function() {
expect(2);//expect(6);

same(
jQuery("#ap").map(function(){
return jQuery(this).find("a").get();
}).get(),
q("google", "groups", "anchor1", "mark"),
"Array Map"
);

same(
jQuery("#ap > a").map(function(){
return this.parentNode;
}).get(),
q("ap","ap","ap"),
"Single Map"
);

return;//these haven't been accepted yet

//for #2616
var keys = jQuery.map( {a:1,b:2}, function( v, k ){
return k;
}, [ ] );

equals( keys.join(""), "ab", "Map the keys from a hash to an array" );

var values = jQuery.map( {a:1,b:2}, function( v, k ){
return v;
}, [ ] );

equals( values.join(""), "12", "Map the values from a hash to an array" );

var scripts = document.getElementsByTagName("script");
var mapped = jQuery.map( scripts, function( v, k ){
return v;
}, {length:0} );

equals( mapped.length, scripts.length, "Map an array(-like) to a hash" );

var flat = jQuery.map( Array(4), function( v, k ){
return k % 2 ? k : [k,k,k];//try mixing array and regular returns
});

var elements = jQuery([window, document]),
inputElements = jQuery('#radio1,#radio2,#check1,#check2');

// Passing a node
equals( elements.index(window), 0, "Check for index of elements" );
equals( elements.index(document), 1, "Check for index of elements" );
equals( inputElements.index(document.getElementById('radio1')), 0, "Check for index of elements" );
equals( inputElements.index(document.getElementById('radio2')), 1, "Check for index of elements" );
equals( inputElements.index(document.getElementById('check1')), 2, "Check for index of elements" );
equals( inputElements.index(document.getElementById('check2')), 3, "Check for index of elements" );
equals( inputElements.index(window), -1, "Check for not found index" );
equals( inputElements.index(document), -1, "Check for not found index" );

// Passing a jQuery object
// enabled since [5500]
equals( elements.index( elements ), 0, "Pass in a jQuery object" );
equals( elements.index( elements.eq(1) ), 1, "Pass in a jQuery object" );
equals( jQuery("#form :radio").index( jQuery("#radio2") ), 1, "Pass in a jQuery object" );

// Passing a selector or nothing
// enabled since [6330]
equals( jQuery('#text2').index(), 2, "Check for index amongst siblings" );
equals( jQuery('#form').children().eq(4).index(), 4, "Check for index amongst siblings" );
equals( jQuery('#radio2').index('#form :radio') , 1, "Check for index within a selector" );
equals( jQuery('#form :radio').index( jQuery('#radio2') ), 1, "Check for index within a selector" );
equals( jQuery('#radio2').index('#form :text') , -1, "Check for index not found within a selector" );
equals( flat.join(""), "00012223", "try the new flatten technique(#2616)" );
});

test("jQuery.merge()", function() {

0 comments on commit 474d814

Please sign in to comment.
You can’t perform that action at this time.