fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fix ie8 native xmlhttp support disabled issues
This commit is contained in:
John McLear 2012-09-03 06:35:52 -07:00
parent 23d22b92fd 67088e5b7f
commit de7934d9fb
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node/hooks/express/socketio.js
View File

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

2
src/package.json
View File

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

8
src/static/js/pad.js
View File

@ -183,12 +183,6 @@ function savePassword()
document.location=document.location; 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() function handshake()
{ {
var loc = document.location; var loc = document.location;
@ -439,8 +433,6 @@ var pad = {
$(document).ready(function() $(document).ready(function()
{ {
// test for XML HTTP capabiites
ieTestXMLHTTP();
// start the custom js // start the custom js
if (typeof customStart == "function") customStart(); if (typeof customStart == "function") customStart();
getParams(); getParams();