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/21 02:18:41 UTC
[wicket] branch WICKET-6846-remove-activex created (now f12e443)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch WICKET-6846-remove-activex
in repository https://gitbox.apache.org/repos/asf/wicket.git.
at f12e443 [WICKET-6846] ActiveXObject for DOM parsing is removed
This branch includes the following new commits:
new f12e443 [WICKET-6846] ActiveXObject for DOM parsing is removed
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[wicket] 01/01: [WICKET-6846] ActiveXObject for DOM parsing is
removed
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch WICKET-6846-remove-activex
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit f12e443ab4b5abd7ed0765443e4057b5e5d22a0e
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;
}