public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

pull/1238/head
John McLear 2012-11-29 07:29:30 -08:00
parent edb1a3c481 53d6d0813e
commit 11af9228db
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,13 +36,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
});
});
// 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']);
// there shouldn#t be a browser that isn't compatible to all
// transports in this list at once
// e.g. XHR is disabled in IE by default, so in IE it should use jsonp-polling
io.set('transports', ['xhr-polling', 'jsonp-polling', 'htmlfile']);
var socketIOLogger = log4js.getLogger("socket.io");
io.set('logger', {

10
src/static/js/ace2_inner.js
View File

@ -333,14 +333,6 @@ function Ace2Inner(){
return colorutils.triple2css(color);
}
function doAlert(str)
{
scheduler.setTimeout(function()
{
alert(str);
}, 0);
}
editorInfo.ace_getRep = function()
{
return rep;
@ -1624,7 +1616,7 @@ function Ace2Inner(){
if (linesWrapped > 0)
{
doAlert("Editor warning: " + linesWrapped + " long line" + (linesWrapped == 1 ? " was" : "s were") + " hard-wrapped into " + ccData.numLinesAfter + " lines.");
// console.log("Editor warning: " + linesWrapped + " long line" + (linesWrapped == 1 ? " was" : "s were") + " hard-wrapped into " + ccData.numLinesAfter + " lines.");
}
if (ss[0] >= 0) selStart = [ss[0] + a + netNumLinesChangeSoFar, ss[1]];