From 1f58b37a5e86603b16e137031c36f37580e9d410 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 7 Oct 2018 18:42:43 -0700 Subject: Refactor HTTP response builder --- ui/static_javascript.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'ui/static_javascript.go') diff --git a/ui/static_javascript.go b/ui/static_javascript.go index 248fae3a..ff7fd16b 100644 --- a/ui/static_javascript.go +++ b/ui/static_javascript.go @@ -17,13 +17,15 @@ import ( // Javascript renders application client side code. func (c *Controller) Javascript(w http.ResponseWriter, r *http.Request) { filename := request.RouteStringParam(r, "name") - if _, found := static.Javascripts[filename]; !found { - html.NotFound(w) + etag, found := static.JavascriptsChecksums[filename] + if !found { + html.NotFound(w, r) return } - body := static.Javascripts[filename] - etag := static.JavascriptsChecksums[filename] - - response.Cache(w, r, "text/javascript; charset=utf-8", etag, []byte(body), 48*time.Hour) + response.New(w, r).WithCaching(etag, 48*time.Hour, func(b *response.Builder) { + b.WithHeader("Content-Type", "text/javascript; charset=utf-8") + b.WithBody(static.Javascripts[filename]) + b.Write() + }) } -- cgit v1.2.3