X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=91ac9bc3f4fd12d36148cc67bf589915d1fbc48b;hb=874e4f65eecdf74bb76c361d778aac4ed6158ed6;hp=44c1eec2296fc8044b816c23b4be8f46e6889a3e;hpb=367abc373be76ae24b5aed2c5e49fbc308ecebcc;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 44c1eec..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 )