This is an automated email from the ASF dual-hosted git repository. svenmeier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 3c70f63a19eea8bc3402c1004e01d3e02316cc74 Author: Sven Meier <[email protected]> AuthorDate: Fri May 10 08:45:22 2019 +0200 WICKET-6667 JS removed parsing with ActiveXObject DOMParser is supported since IE 9 --- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 37 ++-------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js index 4d03f21..8d168ee 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js @@ -15,7 +15,7 @@ * limitations under the License. */ -/*global DOMParser: true, ActiveXObject: true, console: true */ +/*global DOMParser: true, console: true */ /* * Wicket Ajax Support @@ -1167,40 +1167,9 @@ Xml: { parse: function (text) { - var xmlDocument; - if (window.DOMParser) { - var parser = new DOMParser(); - xmlDocument = parser.parseFromString(text, "text/xml"); - } else if (window.ActiveXObject) { - try { - xmlDocument = new ActiveXObject("Msxml2.DOMDocument.6.0"); - } catch (err6) { - try { - xmlDocument = new ActiveXObject("Msxml2.DOMDocument.5.0"); - } catch (err5) { - try { - xmlDocument = new ActiveXObject("Msxml2.DOMDocument.4.0"); - } catch (err4) { - try { - xmlDocument = new ActiveXObject("MSXML2.DOMDocument.3.0"); - } catch (err3) { - try { - xmlDocument = new ActiveXObject("Microsoft.XMLDOM"); - } catch (err2) { - Wicket.Log.error("Cannot create DOM document: " + err2); - } - } - } - } - } + var parser = new DOMParser(); - if (xmlDocument) { - xmlDocument.async = "false"; - if (!xmlDocument.loadXML(text)) { - Wicket.Log.error("Error parsing response: "+text); - } - } - } + var xmlDocument = parser.parseFromString(text, "text/xml"); return xmlDocument; }
