try again

This commit is contained in:
John McLear 2015-01-21 15:06:29 +00:00
commit 3fd6e72657
40 changed files with 269 additions and 115 deletions

View file

@ -1919,6 +1919,7 @@ function Ace2Inner(){
if (charsLeft === 0)
{
var index = 0;
browser.msie = false; // Temp fix to resolve enter and backspace issues..
if (browser.msie && line == (rep.lines.length() - 1) && lineNode.childNodes.length === 0)
{
// best to stay at end of last empty div in IE
@ -4867,7 +4868,7 @@ function Ace2Inner(){
})
// CompositionEvent is not implemented below IE version 8
if ( !(browser.msie && browser.version <= 9) && document.documentElement)
if ( !(browser.msie && parseInt(browser.version <= 9)) && document.documentElement)
{
$(document.documentElement).on("compositionstart", handleCompositionEvent);
$(document.documentElement).on("compositionend", handleCompositionEvent);

View file

@ -626,13 +626,11 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
_ensureColumnZero(state);
}
}
if (abrowser.msie)
{
// in IE, a point immediately after a DIV appears on the next line
_reachBlockPoint(node, 1, state);
}
state.localAttribs = localAttribs;
};
// can pass a falsy value for end of doc

View file

@ -62,8 +62,8 @@ function init() {
var resource = exports.baseURL.substring(1) + 'socket.io';
//build up the socket io connection
socket = io.connect(url, {resource: resource});
socket = io.connect(url, {path: exports.baseURL + 'socket.io', resource: resource});
//send the ready message once we're connected
socket.on('connect', function()
{