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-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
John McLear 2013-12-19 17:32:34 +00:00
commit fcfa14b490
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/static/js/ace2_inner.js
View file

@ -1668,7 +1668,7 @@ function Ace2Inner(){
{
//var id = n.uniqueId();
// parent of n may not be "root" in IE due to non-tree-shaped DOM (wtf)
n.parentNode.removeChild(n);
if(n.parentNode) n.parentNode.removeChild(n);
//dmesg(htmlPrettyEscape(htmlForRemovedChild(n)));
//console.log("removed: "+id);
@ -2334,7 +2334,10 @@ function Ace2Inner(){
return false; // If we're at the end of a line we treat it as having no formatting
}
if(rep.selStart[1] == 0 && rep.selEnd[1] == 0){
return false; // If we're at the start of a line attributes get confused..
rep.selEnd[1] == 1;
}
if(rep.selEnd[1] == -1){
rep.selEnd[1] = 1; // sometimes rep.selEnd is -1, not sure why.. When it is we should look at the first char
}
if (n == selStartLine)
{
@ -3952,6 +3955,7 @@ function Ace2Inner(){
selection.focusAtStart = !! rep.selFocusAtStart;
setSelection(selection);
}
editorInfo.ace_updateBrowserSelectionFromRep = updateBrowserSelectionFromRep;
function nodeMaxIndex(nd)
{