git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed issue with $( obj, jQuery ) breaking the original jQuery object.
[jquery.git]
/
src
/
jquery
/
jquery.js
diff --git
a/src/jquery/jquery.js
b/src/jquery/jquery.js
index
ec97116
..
a373c5b
100644
(file)
--- a/
src/jquery/jquery.js
+++ b/
src/jquery/jquery.js
@@
-59,10
+59,12
@@
function jQuery(a,c) {
*/
// Watch for when a jQuery object is passed as the selector
*/
// Watch for when a jQuery object is passed as the selector
- if ( a.jquery ) return a;
+ if ( a.jquery )
+ return $( jQuery.merge( a, [] ) );
// Watch for when a jQuery object is passed at the context
// Watch for when a jQuery object is passed at the context
- if ( c && c.jquery ) return c.find(a);
+ if ( c && c.jquery )
+ return $( c ).find(a);
// If the context is global, return a new object
if ( window == this )
// If the context is global, return a new object
if ( window == this )
@@
-314,7
+316,7
@@
jQuery.fn = jQuery.prototype = {
// Look for the case where we're accessing a style value
jQuery[ type || "attr" ]( this[0], key );
},
// Look for the case where we're accessing a style value
jQuery[ type || "attr" ]( this[0], key );
},
-
+
/**
* Access a style property on the first matched element.
* This method makes it easy to retreive a style property value
/**
* Access a style property on the first matched element.
* This method makes it easy to retreive a style property value
@@
-1029,7
+1031,8
@@
jQuery.extend({
// Form elements
enabled: "!a.disabled",
disabled: "a.disabled",
// Form elements
enabled: "!a.disabled",
disabled: "a.disabled",
- checked: "a.checked"
+ checked: "a.checked",
+ selected: "a.selected"
},
".": "jQuery.className.has(a,m[2])",
"@": {
},
".": "jQuery.className.has(a,m[2])",
"@": {
@@
-2370,6
+2373,11
@@
jQuery.macros = {
},
each: {
},
each: {
+
+ removeAttr: function( key ) {
+ this.removeAttribute( key );
+ },
+
/**
* Displays each of the set of matched elements if they are hidden.
*
/**
* Displays each of the set of matched elements if they are hidden.
*