From 1dfebdf6db2fcd87301031299b4c7d0b81500061 Mon Sep 17 00:00:00 2001
From: MatAsmania <46297405+MatAsmania@users.noreply.github.com>
Date: Wed, 7 Apr 2021 22:48:49 +0200
Subject: [PATCH] Fix for Evernote workaround and support for en-todo (#1827)

---
 src/services/import/enex.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/services/import/enex.js b/src/services/import/enex.js
index e366d8016..a9331d9f1 100644
--- a/src/services/import/enex.js
+++ b/src/services/import/enex.js
@@ -55,19 +55,23 @@ function importEnex(taskContext, file, parentNote) {
         content = content.trim();
 
         // workaround for https://github.com/ckeditor/ckeditor5-list/issues/116
-        content = content.replace(/<li>\s+<div>/g, "<li>");
-        content = content.replace(/<\/div>\s+<\/li>/g, "</li>");
+        content = content.replace(/<li>\s*<div>/g, "<li>");
+        content = content.replace(/<\/div>\s*<\/li>/g, "</li>");
 
         // workaround for https://github.com/ckeditor/ckeditor5-list/issues/115
-        content = content.replace(/<ul>\s+<ul>/g, "<ul><li><ul>");
-        content = content.replace(/<\/li>\s+<ul>/g, "<ul>");
-        content = content.replace(/<\/ul>\s+<\/ul>/g, "</ul></li></ul>");
-        content = content.replace(/<\/ul>\s+<li>/g, "</ul></li><li>");
+        content = content.replace(/<ul>\s*<ul>/g, "<ul><li><ul>");
+        content = content.replace(/<\/li>\s*<ul>/g, "<ul>");
+        content = content.replace(/<\/ul>\s*<\/ul>/g, "</ul></li></ul>");
+        content = content.replace(/<\/ul>\s*<li>/g, "</ul></li><li>");
 
-        content = content.replace(/<ol>\s+<ol>/g, "<ol><li><ol>");
-        content = content.replace(/<\/li>\s+<ol>/g, "<ol>");
-        content = content.replace(/<\/ol>\s+<\/ol>/g, "</ol></li></ol>");
-        content = content.replace(/<\/ol>\s+<li>/g, "</ol></li><li>");
+        content = content.replace(/<ol>\s*<ol>/g, "<ol><li><ol>");
+        content = content.replace(/<\/li>\s*<ol>/g, "<ol>");
+        content = content.replace(/<\/ol>\s*<\/ol>/g, "</ol></li></ol>");
+        content = content.replace(/<\/ol>\s*<li>/g, "</ol></li><li>");
+
+        // Replace en-todo with unicode ballot box
+        content = content.replace(/<en-todo\s+checked="true"\/>/g, "\u2611 ");
+        content = content.replace(/<en-todo(\s+checked="false")?\/>/g, "\u2610 ");
 
         content = htmlSanitizer.sanitize(content);