Author: mgrigorov
Date: Thu Jul 14 08:19:21 2011
New Revision: 1146596
URL: http://svn.apache.org/viewvc?rev=1146596&view=rev
Log:
WICKET-3887 Problems concerning IE9 with "ActiveX Filtering" enabled
Feature detection improvement - first try availability of window.DOMParser and
then fallback to window.ActiveXObject.
This way IE9 works as the other browsers.
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=1146596&r1=1146595&r2=1146596&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Thu Jul 14 08:19:21 2011
@@ -1514,14 +1514,14 @@ Wicket.Head.Contributor.prototype = {
// build a DOM tree of the contribution
var xmldoc;
- if (window.ActiveXObject) {
+ if (window.DOMParser) {
+ var parser = new DOMParser();
+ xmldoc = parser.parseFromString(text, "text/xml");
+ } else if (window.ActiveXObject) {
xmldoc = new ActiveXObject("Microsoft.XMLDOM");
if (!xmldoc.loadXML(text)) {
Wicket.Log.error("Error parsing response:
"+text);
}
- } else {
- var parser = new DOMParser();
- xmldoc = parser.parseFromString(text, "text/xml");
}
return xmldoc;
