From cc2736ae3d5a1ef3aa4a7e272aa348c0963a335e Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 6 Jun 2020 22:13:32 +0000 Subject: [PATCH] Revert "remove cruft" This reverts commit 1cff58fec83bdc14a3e45162ca908e2f06dafe23. --- src/static/js/ace2_inner.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index e599d0b5f..44ac275e4 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -5167,6 +5167,8 @@ function Ace2Inner(){ var level = 0; var listType = /([a-z]+)([0-9]+)/.exec(getLineListType(n)); + var togglineOn = false; + // Used to outdent if ol is removed if(allLinesAreList){ togglingOn = false; @@ -5185,7 +5187,9 @@ function Ace2Inner(){ if(togglingOn){ mods.push([n, allLinesAreList ? 'indent' + level : (t ? type + level : type + '1')]); - }else{ + } + + if(!togglingOn){ // 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 @@ -5193,7 +5197,7 @@ function Ace2Inner(){ // else change to indented not bullet if(level > 1){ setLineListType(n, ''); // remove bullet - let newLevel = level + 1; + let newLevel = level+1; setLineListType(n, "indent"+level); // outdent } }