git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9449591
)
Added a fix for $("object *") in IE7.
author
John Resig
<jeresig@gmail.com>
Thu, 11 Jan 2007 07:31:40 +0000
(07:31 +0000)
committer
John Resig
<jeresig@gmail.com>
Thu, 11 Jan 2007 07:31:40 +0000
(07:31 +0000)
src/selector/selector.js
patch
|
blob
|
history
diff --git
a/src/selector/selector.js
b/src/selector/selector.js
index
4a6d105
..
e9e859e
100644
(file)
--- a/
src/selector/selector.js
+++ b/
src/selector/selector.js
@@
-235,12
+235,20
@@
jQuery.extend({
// We need to find all descendant elements, it is more
// efficient to use getAll() when we are already further down
// the tree - we try to recognize that here
// We need to find all descendant elements, it is more
// efficient to use getAll() when we are already further down
// the tree - we try to recognize that here
- for ( var i = 0, rl = ret.length; i < rl; i++ )
+ for ( var i = 0, rl = ret.length; i < rl; i++ ) {
+ // Grab the tag name being searched for
+ var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
+
+ // Handle IE7 being really dumb about <object>s
+ if ( ret[i].nodeName.toUpperCase() == "OBJECT" && tag == "*" )
+ tag = "param";
+
jQuery.merge( r,
m[1] != "" && ret.length != 1 ?
jQuery.getAll( ret[i], [], m[1], m[2], rec ) :
jQuery.merge( r,
m[1] != "" && ret.length != 1 ?
jQuery.getAll( ret[i], [], m[1], m[2], rec ) :
- ret[i].getElementsByTagName( m[1] != "" || m[0] == "" ? "*" : m[2] )
+ ret[i].getElementsByTagName( tag )
);
);
+ }
// It's faster to filter by class and be done with it
if ( m[1] == "." && ret.length == 1 )
// It's faster to filter by class and be done with it
if ( m[1] == "." && ret.length == 1 )