diff options
Diffstat (limited to 'vendor/github.com/tdewolff/minify/v2/html')
| -rw-r--r-- | vendor/github.com/tdewolff/minify/v2/html/html.go | 6 | ||||
| -rw-r--r-- | vendor/github.com/tdewolff/minify/v2/html/table.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/tdewolff/minify/v2/html/html.go b/vendor/github.com/tdewolff/minify/v2/html/html.go index 23cd2ca07..ce5e96dc3 100644 --- a/vendor/github.com/tdewolff/minify/v2/html/html.go +++ b/vendor/github.com/tdewolff/minify/v2/html/html.go @@ -199,7 +199,7 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, _ map[string]st } else if next.TokenType == html.TextToken && !parse.IsAllWhitespace(next.Data) { // stop looking when text encountered break - } else if next.TokenType == html.StartTagToken || next.TokenType == html.EndTagToken { + } else if next.TokenType == html.StartTagToken || next.TokenType == html.EndTagToken || next.TokenType == html.SvgToken || next.TokenType == html.MathToken { if o.KeepWhitespace { break } @@ -208,7 +208,7 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, _ map[string]st t.Data = t.Data[:len(t.Data)-1] omitSpace = false break - } else if next.TokenType == html.StartTagToken { + } else if next.TokenType == html.StartTagToken || next.TokenType == html.SvgToken || next.TokenType == html.MathToken { break } } @@ -309,7 +309,7 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, _ map[string]st // skip text in select and optgroup tags if t.Hash == Option || t.Hash == Optgroup { - if next := tb.Peek(0); next.TokenType == html.TextToken { + if next := tb.Peek(0); next.TokenType == html.TextToken && !next.HasTemplate { tb.Shift() } } diff --git a/vendor/github.com/tdewolff/minify/v2/html/table.go b/vendor/github.com/tdewolff/minify/v2/html/table.go index 37cc866b2..72380a98e 100644 --- a/vendor/github.com/tdewolff/minify/v2/html/table.go +++ b/vendor/github.com/tdewolff/minify/v2/html/table.go @@ -74,7 +74,7 @@ var tagMap = map[Hash]traits{ Input: objectTag, Ins: keepPTag, Kbd: normalTag, - Label: normalTag, + Label: normalTag | keepPTag, // experimentally, keepPTag is needed Legend: blockTag, Li: blockTag, Link: normalTag, @@ -125,7 +125,7 @@ var tagMap = map[Hash]traits{ Th: blockTag, Thead: blockTag, Time: normalTag, - Title: normalTag, + Title: blockTag, Tr: blockTag, Track: normalTag, U: normalTag, |