diff --git a/css/css.go b/css/css.go index 92f885bf1..e618cea89 100644 --- a/css/css.go +++ b/css/css.go @@ -59,9 +59,8 @@ type cssMinifier struct { // Minifier is a CSS minifier. type Minifier struct { - KeepCSS2 bool // DEPRECATED, use Version = 2 - Precision int // number of significant digits - newPrecision int // precision for new numbers + Precision int // number of significant digits + newPrecision int // precision for new numbers Inline bool Version int } @@ -148,11 +147,7 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, params map[stri o.Inline = params != nil && params["inline"] == "1" } if o.Version <= 0 { - if o.KeepCSS2 { - o.Version = 2 - } else { - o.Version = 3 - } + o.Version = 3 } z := parse.NewInput(r) diff --git a/css/css_test.go b/css/css_test.go index e8280c05a..2052972a8 100644 --- a/css/css_test.go +++ b/css/css_test.go @@ -442,7 +442,7 @@ func TestCSSInline(t *testing.T) { } } -func TestCSSKeepCSS2(t *testing.T) { +func TestCSS2(t *testing.T) { tests := []struct { css string expected string @@ -458,7 +458,7 @@ func TestCSSKeepCSS2(t *testing.T) { m := minify.New() params := map[string]string{"inline": "1"} - cssMinifier := &Minifier{KeepCSS2: true} + cssMinifier := &Minifier{Version: 2} for _, tt := range tests { t.Run(tt.css, func(t *testing.T) { r := bytes.NewBufferString(tt.css) diff --git a/svg/svg.go b/svg/svg.go index a4befb6b8..4b8b5be17 100644 --- a/svg/svg.go +++ b/svg/svg.go @@ -32,7 +32,7 @@ type Minifier struct { KeepComments bool Precision int // number of significant digits newPrecision int // precision for new numbers - Inline bool + inline bool } // Minify minifies SVG data, it reads from r and writes to w. @@ -50,8 +50,8 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, params map[stri if o.newPrecision <= 0 || 15 < o.newPrecision { o.newPrecision = 15 // minimum number of digits a double can represent exactly } - if !o.Inline { - o.Inline = params != nil && params["inline"] == "1" + if !o.inline { + o.inline = params != nil && params["inline"] == "1" } // namespaces to keep @@ -171,7 +171,7 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, params map[stri val, _ = o.shortenDimension(val) } if attr == Xml_Space && bytes.Equal(val, []byte("preserve")) || - tag == Svg && (o.Inline && attr == Xmlns || + tag == Svg && (o.inline && attr == Xmlns || attr == Version && bytes.Equal(val, []byte("1.1")) || attr == X && bytes.Equal(val, zeroBytes) || attr == Y && bytes.Equal(val, zeroBytes) || diff --git a/svg/svg_test.go b/svg/svg_test.go index 888f3addd..2f25d3c24 100644 --- a/svg/svg_test.go +++ b/svg/svg_test.go @@ -182,7 +182,7 @@ func TestSVGInline(t *testing.T) { } m := minify.New() - o := &Minifier{Inline: true} + o := &Minifier{inline: true} for _, tt := range svgTests { t.Run(tt.svg, func(t *testing.T) { r := bytes.NewBufferString(tt.svg)