You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/12/30 16:12:34 UTC
svn commit: r1053911 -
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Author: mgrigorov
Date: Thu Dec 30 15:12:32 2010
New Revision: 1053911
URL: http://svn.apache.org/viewvc?rev=1053911&view=rev
Log:
WICKET-1432 Detection of ajax transport type
Prefer window.XMLHttpRequest if it is available.
Now IE7 and IE8 will use that one instead of ActiveXObject
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=1053911&r1=1053910&r2=1053911&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js Thu Dec 30 15:12:32 2010
@@ -694,12 +694,12 @@ Wicket.channelManager = new Wicket.Chann
// Creates a new instance of a XmlHttpRequest
createTransport: function() {
var transport = null;
- if (window.ActiveXObject) {
- transport = new ActiveXObject("Microsoft.XMLHTTP");
- Wicket.Log.info("Using ActiveX transport");
- } else if (window.XMLHttpRequest) {
+ if (window.XMLHttpRequest) {
transport = new XMLHttpRequest();
Wicket.Log.info("Using XMLHttpRequest transport");
+ } else if (window.ActiveXObject) {
+ transport = new ActiveXObject("Microsoft.XMLHTTP");
+ Wicket.Log.info("Using ActiveX transport");
}
if (transport == null) {