Updated the documentation parser to work with categories. Additionally, I updated...

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 44c1eec..91ac9bc 100644 (file)
--- 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 )