X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=91ac9bc3f4fd12d36148cc67bf589915d1fbc48b;hb=874e4f65eecdf74bb76c361d778aac4ed6158ed6;hp=ec9711638fa119650ca8e6c892b036c9275c0e1d;hpb=065cd7ecf62c7b2ad5b58d447aca7a9cdb6f7bcb;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index ec97116..91ac9bc 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -2,8 +2,8 @@ * jQuery - New Wave Javascript * * Copyright (c) 2006 John Resig (jquery.com) - * Licensed under the MIT License: - * http://www.opensource.org/licenses/mit-license.php + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. * * $Date$ * $Rev$ @@ -59,10 +59,12 @@ function jQuery(a,c) { */ // 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 - 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 ) @@ -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 ); }, - + /** * 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", - checked: "a.checked" + checked: "a.checked", + selected: "a.selected" }, ".": "jQuery.className.has(a,m[2])", "@": { @@ -2370,6 +2373,11 @@ jQuery.macros = { }, each: { + + removeAttr: function( key ) { + this.removeAttribute( key ); + }, + /** * Displays each of the set of matched elements if they are hidden. *