mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed merge conflicts

Browse source
This commit is contained in:
John McLear 2011-12-04 18:55:35 +00:00 • committed by Peter 'Pita' Martischka
parent 3401a7bc11
commit d20dcc7c57
4 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/ace2_inner.js
View file

@ -1127,6 +1127,10 @@ function OUTER(gscope)
{
setTextSize(value);
}
else if (k == 'rtlistrue')
{
setClassPresence(root, "rtl", !! value);
}
}
editorInfo.ace_setBaseText = function(txt)