From: Michael Geary <mike@geary.com>
Date: Sun, 2 Jul 2006 02:11:37 +0000 (+0000)
Subject: Fix jQuery.httpData to allow forcing of text data
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=05a4b784e892ea0dd56201fa1b7a77c7a453bfa7;p=jquery.git

Fix jQuery.httpData to allow forcing of text data
---

diff --git a/ajax/ajax.js b/ajax/ajax.js
index 5d6126a..632ed86 100644
--- a/ajax/ajax.js
+++ b/ajax/ajax.js
@@ -174,11 +174,13 @@ jQuery.httpSuccess = function(r) {
 		r.status == 304 ) || !r.status && location.protocol == "file:";
 };
 
-// Get the data out of an XMLHttpRequest
+// Get the data out of an XMLHttpRequest.
+// Return parsed XML if content-type header is "xml" and type is "xml" or omitted,
+// otherwise return plain text.
 jQuery.httpData = function(r,type) {
-	// Check the headers, or watch for a force override
-	return r.getResponseHeader("content-type").indexOf("xml") > 0 || 
-		type == "xml" ? r.responseXML : r.responseText;
+	var xml = ( !type || type == "xml" ) &&
+		r.getResponseHeader("content-type").indexOf("xml") >= 0;
+	return xml ? r.responseXML : r.responseText;
 };
 
 // Serialize an array of form elements or a set of