Improved Markdown parser.

totaljs · Sep 14, 2024 · 1f3ed69 · 1f3ed69
1 parent 1eaa0ab
commit 1f3ed69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -5,6 +5,7 @@
 - fixed inline declared middleware `&middleware` in the `ROUTE()` method
 - fixed partial validation
 - fix image bug in the `Image.measureWEBP()` method by [Marek Mraz](https://github.com/Mrazbb)
+- improved Markdown parser
 
 ========================
 0.0.97

diff --git a/markdown.js b/markdown.js
@@ -9,7 +9,7 @@ const REG_ICONS = /(^|[^\w]):((fab|far|fas|fal|fad|fa|ti)\s(fa|ti)-)?[a-z-]+:([^
 const REG_KEYWORDS = /\{.*?\}\(.*?\)/g;
 const REG_LINKEXTERNAL = /(https|http):\/\//;
 const REG_FORMAT = /__.*?__|_.*?_|\*\*.*?\*\*|\*.*?\*|~~.*?~~|~.*?~/g;
-const REG_ORDERED = /^[a-z|0-9]{1,3}\.\s|^-\s/i;
+const REG_ORDERED = /^[a-z|0-9]{1,3}\.\s|^(-|\*|\+)\s/i;
 const REG_ORDEREDSIZE = /^(\s|\t)+/;
 const REG_CODE = /`.*?`/g;
 const REG_ENCODETAGS = /<|>/g;
@@ -732,7 +732,8 @@ String.prototype.markdown = function(opt, nested) {
 			else
 				size = 0;
 
-			var ultype = tmpline.charAt(0) === '-' ? 'ul' : 'ol';
+			var c = tmpline.charAt(0);
+			var ultype = c === '-' || c === '*' || c === '+' ? 'ul' : 'ol';
 			var tmpstr = (ultype === 'ol' ? tmpline.substring(tmpline.indexOf('.') + 1) : tmpline.substring(2));
 			var istask = false;