libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Revert "editor: ul/ol/li - outdent on ol and ul button press""

Browse source 
This reverts commit 82fb6ddc99.
This commit is contained in:
John McLear 2020-06-06 20:38:08 +00:00
parent 2ce798339d
commit fd3980133d
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5166,6 +5166,7 @@ function Ace2Inner(){
var t = ''; var t = '';
var level = 0; var level = 0;
var listType = /([a-z]+)([0-9]+)/.exec(getLineListType(n)); var listType = /([a-z]+)([0-9]+)/.exec(getLineListType(n));
var togglingOn = !allLinesAreList;
if (listType) if (listType)
{ {
t = listType[1]; t = listType[1];
@ -5173,14 +5174,26 @@ function Ace2Inner(){
} }
var t = getLineListType(n); var t = getLineListType(n);
// if already a list, deindent if(t === listType) togglingOn = false;
if (allLinesAreList && level != 1) { level = level - 1; }
// if already indented, then add a level of indentation to the list
else if (t && !allLinesAreList) { level = level + 1; }
if(togglingOn){
mods.push([n, allLinesAreList ? 'indent' + level : (t ? type + level : type + '1')]); mods.push([n, allLinesAreList ? 'indent' + level : (t ? type + level : type + '1')]);
} }
if(!togglingOn){ // remove removing because we have
// scrap the entire indentation and list type
if(level === 1){ // if outdending but are the first item in the list then outdent
setLineListType(n, ''); // outdent
}
// else change to indented not bullet
if(level > 1){
setLineListType(n, ''); // reomve bullet
let newLevel = level+1;
setLineListType(n, "indent"+level); // outdent
}
}
}
_.each(mods, function(mod){ _.each(mods, function(mod){
setLineListType(mod[0], mod[1]); setLineListType(mod[0], mod[1]);
}); });