This is an automated email from the ASF dual-hosted git repository.

svenmeier pushed a commit to branch wicket-js-cleanup
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-js-cleanup by this push:
     new 2f15162  JS removed parsing with ActiveXObject
2f15162 is described below

commit 2f15162b29b2cfd87d6977727ef19f8340355f9f
Author: Sven Meier <svenme...@apache.org>
AuthorDate: Fri May 10 08:45:22 2019 +0200

    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;
                        }

Reply via email to