Made some minor fixes to how content-type and context is handled on remote XML files.

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index d8494d3fb25ae0195637d324c03e6ac6ba9b3ef2..87dfc9d397e40ca7369dfd683d50cc0897793c04 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -264,8 +264,8 @@ jQuery.extend({
        // otherwise return plain text.
        httpData: function(r,type) {
                var ct = r.getResponseHeader("content-type");
-               var data = ( !type || type == "xml" ) && ct && ct.indexOf("xml") >= 0;
-               data = data ? r.responseXML : r.responseText;
+               var data = !type && ct && ct.indexOf("xml") >= 0;
+               data = type == "xml" || data ? r.responseXML : r.responseText;
 
                // If the type is "script", eval it
                if ( type == "script" ) eval.call( window, data );

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 470dbdeaecab962867b592c68776341af600d56d..846c8154124ce63b510eb2736af3122ff5025263 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -36,7 +36,7 @@ function jQuery(a,c) {
        if ( a && a.constructor == Function && jQuery.fn.ready )
                return jQuery(document).ready(a);
 
-       // Make sure t hat a selection was provided
+       // Make sure that a selection was provided
        a = a || jQuery.context || document;
 
        /*
@@ -59,12 +59,10 @@ function jQuery(a,c) {
        */
 
        // Watch for when a jQuery object is passed as the selector
-       if ( a.jquery )
-               return a;
+       if ( a.jquery ) return a;
 
        // Watch for when a jQuery object is passed at the context
-       if ( c && c.jquery )
-               return jQuery(c.get()).find(a);
+       if ( c && c.jquery ) return c.find(a);
        
        // If the context is global, return a new object
        if ( window == this )