libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-08 03:02:03 +01:00
Code Issues Projects Releases Wiki Activity

fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled

Browse source
This commit is contained in:
Wikinaut 2012-08-16 01:00:36 +02:00
parent 6a3457dbd7
commit 85f5eb38e4
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/hooks/express/socketio.js
View file

@ -29,7 +29,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
//this is only a workaround to ensure it works with all browers behind a proxy //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 //we should remove this when the new socket.io version is more stable
io.set('transports', ['xhr-polling']); io.set('transports', ['htmlfile','xhr-polling']);
var socketIOLogger = log4js.getLogger("socket.io"); var socketIOLogger = log4js.getLogger("socket.io");
io.set('logger', { io.set('logger', {

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();