From 155dbad029e001f4752a4aedc901cf950ebfe64d Mon Sep 17 00:00:00 2001 From: Rick Waldron Date: Mon, 17 Dec 2012 17:41:38 -0500 Subject: [PATCH] 2.0: Reduced parseXML Signed-off-by: Rick Waldron --- src/core.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) 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;