From bcc48214ea4037ce442c29e937c98be5adc6f4a6 Mon Sep 17 00:00:00 2001 From: Jordan Hollinger Date: Sat, 7 Jul 2012 13:23:33 -0400 Subject: [PATCH 1/6] Bugfix to getLastEdited API method, issue #845 --- src/node/db/API.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/node/db/API.js b/src/node/db/API.js index 661b78595..68a57d7d0 100644 --- a/src/node/db/API.js +++ b/src/node/db/API.js @@ -298,7 +298,10 @@ exports.getLastEdited = function(padID, callback) getPadSafe(padID, true, function(err, pad) { if(ERR(err, callback)) return; - callback(null, {lastEdited: pad.getLastEdited()}); + pad.getLastEdit(function(err, value) { + if(ERR(err, callback)) return; + callback(null, {lastEdited: value}); + }); }); } From 4cf5f2b12ce9034f28b77c06b884f2c0440efc1c Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Thu, 16 Aug 2012 01:00:36 +0200 Subject: [PATCH 2/6] 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 132283a7c..899eb985f 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 df6342e2d..d1280694f 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 3/6] 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 002d05aba..7cb938997 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 4/6] 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 899eb985f..4f780cb0b 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', { From 08fa0d23a8aba75f41f910a13c8e471e7f81c65c Mon Sep 17 00:00:00 2001 From: rasos Date: Mon, 3 Sep 2012 02:40:09 +0300 Subject: [PATCH 5/6] Update README.md npm cache clean jshint was the only way to get jshint installed correctly again.. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cdb623f3..f7c70273e 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,8 @@ If you have multiple settings files, you may pass one to `bin/run.sh` using the You should use a dedicated database such as "mysql" if you are planning on using etherpad-lite in a production environment, the "dirty" database driver is only for testing and/or development purposes. -You can update to the latest version with `git pull origin`. The next start with bin/run.sh will update the dependencies +You can update to the latest version with `git pull origin`. The next start with bin/run.sh will update the dependencies. You probably need to do a `npm cache clean jshint` before, in case that throws an error message. + Look at this wiki pages: From 7fe796f98e00525d8ecb26ae943a48dc057e6a7c Mon Sep 17 00:00:00 2001 From: rasos Date: Mon, 3 Sep 2012 15:01:09 +0300 Subject: [PATCH 6/6] Update README.md: node download links and versions node downloads corrected links and preferred versions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f7c70273e..e3acfc383 100644 --- a/README.md +++ b/README.md @@ -62,9 +62,9 @@ Here is the **[FAQ](https://github.com/Pita/etherpad-lite/wiki/FAQ)**
  • Install node.js
      -
    1. Download the latest 0.6.x node.js release from http://nodejs.org/#download
      2. -
    2. Extract it with tar xf node-v0.6*
      3. -
    3. Move into the node folder cd node-v0.6* and build node with ./configure && make && make install
      4. +
    4. Download the latest node.js release (both 0.6 and 0.8 are supported, recommended is stable 0.8.8) from http://nodejs.org
      5. +
    5. Extract it with tar xf node-v0.8.8
      6. +
    6. Move into the node folder cd node-v0.8.8 and build node with ./configure && make && make install