Skip to content
Permalink
Browse files

Made some minor fixes to how content-type and context is handled on r…

…emote XML files.
  • Loading branch information
jeresig committed Aug 17, 2006
1 parent 5ec5de6 commit 26580d2675918bb689d55293e734e68671b4dfc6
Showing with 5 additions and 7 deletions.
  1. +2 −2 src/ajax/ajax.js
  2. +3 −5 src/jquery/jquery.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 );
@@ -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 )

0 comments on commit 26580d2

Please sign in to comment.
You can’t perform that action at this time.