修复 specialhtml 的bug

Author: Jiang Shang

dist/Parser.js

@@ -254,7 +254,7 @@ var Parser = (function () {
                     return this.htmlspecialchars(unsafeTagMatches[0]);
                 }
             }
-
+            console.log(text);
             text = text.replace(/</g, '&lt;');
             text = text.replace(/>/g, '&gt;');
 

hyperdown.js

@@ -290,16 +290,14 @@
 	                return '<a href="' + p1 + '">' + p1 + '</a>';
 	            });
 
-	            // encode unsafe tags
-	            var unsafeTagMatches = /<(\/?)([a-z0-9-]+)(\s+[^>]*)?>/i.exec(text);
-	            if (unsafeTagMatches) {
-	                var whiteLists = this.commonWhiteList + '|' + whiteList;
-	                if (whiteLists.toLowerCase().indexOf(unsafeTagMatches[2].toLowerCase()) !== -1) {
-	                    return this.makeHolder(unsafeTagMatches[0]);
+	            text = text.replace(/<(\/?)([a-z0-9-]+)(\s+[^>]*)?>/ig, function (match, p1, p2, p3) {
+	                var whiteLists = _this3.commonWhiteList + '|' + whiteList;
+	                if (whiteLists.toLowerCase().indexOf(p2.toLowerCase()) !== -1) {
+	                    return _this3.makeHolder(match);
 	                } else {
-	                    return this.htmlspecialchars(unsafeTagMatches[0]);
+	                    return _this3.htmlspecialchars(match);
 	                }
-	            }
+	            });
 
 	            text = text.replace(/</g, '&lt;');
 	            text = text.replace(/>/g, '&gt;');

src/Parser.js

@@ -188,16 +188,14 @@ export default class Parser {
             return `<a href="${p1}">${p1}</a>`
         })
 
-        // encode unsafe tags
-        let unsafeTagMatches = /<(\/?)([a-z0-9-]+)(\s+[^>]*)?>/i.exec(text)
-        if (unsafeTagMatches) {
+        text = text.replace(/<(\/?)([a-z0-9-]+)(\s+[^>]*)?>/ig, (match, p1, p2, p3) => {
             let whiteLists = this.commonWhiteList + '|' + whiteList
-            if (whiteLists.toLowerCase().indexOf(unsafeTagMatches[2].toLowerCase()) !== -1) {
-                return this.makeHolder(unsafeTagMatches[0])
+            if(whiteLists.toLowerCase().indexOf(p2.toLowerCase()) !== -1 ) {
+                return this.makeHolder(match)
             } else {
-                return this.htmlspecialchars(unsafeTagMatches[0])
+                return this.htmlspecialchars(match)
             }
-        }
+        })
 
         text = text.replace(/</g, '&lt;')
         text = text.replace(/>/g, '&gt;')

test/test.js

@@ -94,5 +94,8 @@ describe('HyperDown.js', function() {
             var codeInList = "1. 如下代码片段中的空检查是否有意义？\n Question * q = new Question;\n    if (q == NULL ) {\n    }\n    从上面我们了解到，\`operator new\` 在分配内存失败的情况下会调用 \`new_handler\` 尝试让系统释放点内存，然后再次尝试申请内存。如果这时系统中内存确实紧张，即使调用。";
             assert.equal('<ol><li><p>如下代码片段中的空检查是否有意义？<br> Question * q = new Question;</p></li></ol>', parser.makeHtml(codeInList));
         });
+        it('specialhtml', function() {
+            assert.equal('<p>&lt;li&gt;asdf</p>', parser.makeHtml('<li>asdf'));
+        });
     });
 });