From: Rick Waldron <waldron.rick@gmail.com>
Date: Mon, 17 Dec 2012 22:41:38 +0000 (-0500)
Subject: 2.0: Reduced parseXML
X-Git-Tag: 2.0.0b1~57^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=155dbad029e001f4752a4aedc901cf950ebfe64d;p=jquery.git

2.0: Reduced parseXML

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
---

diff --git a/src/core.js b/src/core.js
index 96a68c2e6..55ed4317f 100644
--- a/src/core.js
+++ b/src/core.js
@@ -486,19 +486,16 @@ jQuery.extend({
 		if ( !data || typeof data !== "string" ) {
 			return null;
 		}
+
+		// IE9 will throw on ill-formed XML
 		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data , "text/xml" );
+		} catch ( e ) {
 			xml = undefined;
 		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+
+		if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
 			jQuery.error( "Invalid XML: " + data );
 		}
 		return xml;