Merge pull request #958 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues

Fix ie8 native xmlhttp support disabled issues

src/node/hooks/express/socketio.js

@@ -26,10 +26,13 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     });
   });
 
-
-  //this is only a workaround to ensure it works with all browers behind a proxy
-  //we should remove this when the new socket.io version is more stable
-  io.set('transports', ['xhr-polling']);
+  // the following has been successfully tested with the following browsers 
+  // works also behind reverse proxy
+  // Firefox 14.0.1
+  // IE8 with Native XMLHTTP support
+  // IE8 without Native XMLHTTP support
+  // Chrome 21.0.1180.79
+  io.set('transports', ['jsonp-polling']);
 
   var socketIOLogger = log4js.getLogger("socket.io");
   io.set('logger', {

src/package.json

@@ -13,7 +13,7 @@
                       "yajsml"              : "1.1.4",
                       "request"             : "2.9.100",
                       "require-kernel"      : "1.0.5",
-                      "resolve"             : "0.2.1",
+                      "resolve"             : "0.2.x",
                       "socket.io"           : "0.9.x",
                       "ueberDB"             : "0.1.7",
                       "async"               : "0.1.x",

src/static/js/pad.js

@@ -183,12 +183,6 @@ function savePassword()
   document.location=document.location;
 }
 
-function ieTestXMLHTTP(){
-  // Test for IE known XML HTTP issue
-  if ($.browser.msie && !window.XMLHttpRequest){
-    $("#editorloadingbox").html("You do not have XML HTTP enabled in your browser. <a target='_blank' href='https://github.com/Pita/etherpad-lite/wiki/How-to-enable-native-XMLHTTP-support-in-IE'>Fix this issue</a>");
-  }
-}
 function handshake()
 {
   var loc = document.location;
@@ -439,8 +433,6 @@ var pad = {
 
     $(document).ready(function()
     {
-      // test for XML HTTP capabiites
-      ieTestXMLHTTP();
       // start the custom js
       if (typeof customStart == "function") customStart();
       getParams();