From 4cf5f2b12ce9034f28b77c06b884f2c0440efc1c Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Thu, 16 Aug 2012 01:00:36 +0200 Subject: [PATCH 1/3] fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled --- src/node/hooks/express/socketio.js | 2 +- src/static/js/pad.js | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js index 132283a7..899eb985 100644 --- a/src/node/hooks/express/socketio.js +++ b/src/node/hooks/express/socketio.js @@ -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 //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"); io.set('logger', { diff --git a/src/static/js/pad.js b/src/static/js/pad.js index df6342e2..d1280694 100644 --- a/src/static/js/pad.js +++ b/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. Fix this issue"); - } -} 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(); From aa1d2ba1a1aa2b42cc2ffbbaa72390bced7d2bd1 Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Fri, 17 Aug 2012 00:45:02 +0200 Subject: [PATCH 2/3] fix issue #955: upd resolve library to 0.2.3 --- src/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package.json b/src/package.json index 002d05ab..7cb93899 100644 --- a/src/package.json +++ b/src/package.json @@ -13,8 +13,8 @@ "yajsml" : "1.1.3", "request" : "2.9.100", "require-kernel" : "1.0.5", - "resolve" : "0.2.1", - "socket.io" : "0.9.6", + "resolve" : "0.2.x", + "socket.io" : "0.9.x", "ueberDB" : "0.1.7", "async" : "0.1.x", "express" : "2.5.x", From 1e092e3ed439cc2916396415a485edd19733b1c9 Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Sat, 18 Aug 2012 00:47:13 +0200 Subject: [PATCH 3/3] use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues --- src/node/hooks/express/socketio.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js index 899eb985..4f780cb0 100644 --- a/src/node/hooks/express/socketio.js +++ b/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', ['htmlfile','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', {