You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2020/10/24 06:20:59 UTC
[wicket] branch wicket-8.x updated: [WICKET-6846] ActiveXObject for
DOM parsing is removed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch wicket-8.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-8.x by this push:
new 5c7ef20 [WICKET-6846] ActiveXObject for DOM parsing is removed
5c7ef20 is described below
commit 5c7ef201e14e9ebda127b9621ace000630b73afc
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Oct 21 09:18:14 2020 +0700
[WICKET-6846] ActiveXObject for DOM parsing is removed
---
.../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 67f740c..8625bac 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
@@ -1206,40 +1206,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;
}