mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection

Browse source
This commit is contained in:
John McLear 2015-01-05 17:15:38 +00:00
commit c0078abc75
23 changed files with 467 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5052,6 +5052,7 @@ function Ace2Inner(){
{
if(listType == ''){
documentAttributeManager.removeAttributeOnLine(lineNum, listAttributeName);
documentAttributeManager.removeAttributeOnLine(lineNum, 'start');
}else{
documentAttributeManager.setAttributeOnLine(lineNum, listAttributeName, listType);
}