From 766d3c407c1d7ded84adb2190063e7cdd65a38ad Mon Sep 17 00:00:00 2001
From: void <v0id@riseup.net>
Date: Fri, 6 Nov 2020 11:48:37 -0300
Subject: [PATCH] borrar LIs cuando no hay una lista

---
 app/assets/javascripts/02-editor.js | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/02-editor.js b/app/assets/javascripts/02-editor.js
index a6e7254d..c3676794 100644
--- a/app/assets/javascripts/02-editor.js
+++ b/app/assets/javascripts/02-editor.js
@@ -224,7 +224,7 @@ function hasContent (element) {
 function cleanContent (contentEl) {
 	const sel = window.getSelection()
 
-	cleanNode(contentEl)
+	cleanNode(contentEl, contentEl)
 
 	for (const child of contentEl.childNodes) {
 		if (child.tagName) {
@@ -258,6 +258,7 @@ function fixContent (contentEl) {
 				for (const item of child.childNodes) {
 					if (item.tagName !== "LI") notItems.push(item)
 				}
+
 				if (notItems.length) {
 					const item = document.createElement("li")
 					item.append(...notItems)
@@ -274,7 +275,7 @@ function fixContent (contentEl) {
  *  * Junta nodos de la misma "mark" que están al lado
  *  * Borra elementos sin contenido (ver `hasContent`) y no están seleccionados
  */
-function cleanNode (node) {
+function cleanNode (node, contentEl) {
 	for (const child of node.childNodes) {
 		if (child.nodeType === Node.TEXT_NODE) {
 			if (child.nextSibling && child.nextSibling.nodeType === Node.TEXT_NODE) {
@@ -292,8 +293,26 @@ function cleanNode (node) {
 					child.nextSibling.parentNode.removeChild(child.nextSibling)
 				}
 			}
+
+			if (child.tagName === "LI") {
+				let parentEl = child
+				while (
+					parentEl
+					&& !(parentEl.nodeType == Node.ELEMENT_NODE && elementIsBlock(parentEl))
+					&& contentEl.contains(parentEl)
+				)
+					parentEl = parentEl.parentElement
+				
+				if (
+					parentEl
+					&& contentEl.contains(parentEl)
+					&& parentEl.tagName !== "UL"
+					&& parentEl.tagName !== "OL"
+				)
+					moveChildren(child, parentEl, child.nextSibling)
+			}
 		}
-		cleanNode(child)
+		cleanNode(child, contentEl)
 	}
 }
 
@@ -316,8 +335,6 @@ function setupEditor (editorEl) {
 
 				if (parentEl == contentEl) parentEl = parentEl.firstChild
 
-				console.log(parentEl)
-
 				let newEl
 				switch (parentEl.tagName) {
 				case "UL":