git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generic jQuery.merge and safer jQuery.makeArray(nodeList).
[jquery.git]
/
src
/
traversing.js
diff --git
a/src/traversing.js
b/src/traversing.js
index
583a303
..
85976a3
100644
(file)
--- a/
src/traversing.js
+++ b/
src/traversing.js
@@
-52,25
+52,27
@@
jQuery.fn.extend({
},
closest: function( selector, context ) {
},
closest: function( selector, context ) {
- var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null,
- closer = 0;
+ var pos = jQuery.expr.match.POS.test( selector ) ?
+ jQuery( selector, context || this.context ) : null;
return this.map(function(){
return this.map(function(){
- var cur = this;
+ var cur = this, closer = 0;
while ( cur && cur.ownerDocument && cur !== context ) {
if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
while ( cur && cur.ownerDocument && cur !== context ) {
if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
- jQuery.data(cur, "closest", closer);
+ jQuery.lastCloser = closer;
return cur;
}
cur = cur.parentNode;
closer++;
}
return cur;
}
cur = cur.parentNode;
closer++;
}
+ jQuery.lastCloser = -1;
+ return null;
});
},
});
},
- add: function( selector ) {
+ add: function( selector, context ) {
var set = typeof selector === "string" ?
var set = typeof selector === "string" ?
- jQuery( selector ) :
+ jQuery( selector, context || this.context ) :
jQuery.makeArray( selector ),
all = jQuery.merge( this.get(), set );
jQuery.makeArray( selector ),
all = jQuery.merge( this.get(), set );
@@
-185,4
+187,4
@@
jQuery.extend({
return r;
}
return r;
}
-});
\ No newline at end of file
+});