Changeset 116 in code for trunk/morty.go

Timestamp:

Jul 14, 2020, 10:19:04 AM (5 years ago)

Author:

alex

Message:

[fix] fix self closing tag token

Close #57

File:

• trunk/morty.go (modified) (3 diffs)

trunk/morty.go

@@ -146 +146 @@
 }
 
-var SELF_CLOSING_ELEMENTS [][]byte = [][]byte{
-        []byte("area"),
-        []byte("base"),
-        []byte("br"),
-        []byte("col"),
-        []byte("embed"),
-        []byte("hr"),
-        []byte("img"),
-        []byte("input"),
-        []byte("keygen"),
-        []byte("link"),
-        []byte("meta"),
-        []byte("param"),
-        []byte("source"),
-        []byte("track"),
-        []byte("wbr"),
-}
-
 var LINK_REL_SAFE_VALUES [][]byte = [][]byte{
         []byte("alternate"),
@@ -554 +536 @@
                                 safe := !inArray(tag, UNSAFE_ELEMENTS)
                                 if !safe {
-                                        if !inArray(tag, SELF_CLOSING_ELEMENTS) {
+                                        if token != html.SelfClosingTagToken {
                                                 var unsafeTag []byte = make([]byte, len(tag))
                                                 copy(unsafeTag, tag)
@@ -679 +661 @@
                 } else {
                         switch token {
-                        case html.StartTagToken:
+                        case html.StartTagToken, html.SelfClosingTagToken:
                                 tag, _ := decoder.TagName()
                                 if inArray(tag, UNSAFE_ELEMENTS) {