From 7c1a4640dbf1ae06867eb8c7ef152e58daae6de6 Mon Sep 17 00:00:00 2001 From: andreimarcu Date: Wed, 2 Dec 2015 14:58:48 -0500 Subject: [PATCH] Order matters! --- display.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/display.go b/display.go index 6678550..4591522 100644 --- a/display.go +++ b/display.go @@ -77,23 +77,23 @@ func fileDisplayHandler(c web.C, w http.ResponseWriter, r *http.Request) { } else if metadata.Mimetype == "application/pdf" { tpl = Templates["display/pdf.html"] - } else if strings.HasPrefix(metadata.Mimetype, "text/") || supportedBinExtension(extension) { + } else if extension == "story" { if metadata.Size < maxDisplayFileSizeBytes { bytes, err := ioutil.ReadFile(filePath) if err == nil { - extra["extension"] = extension - extra["lang_hl"], extra["lang_ace"] = extensionToHlAndAceLangs(extension) extra["contents"] = string(bytes) - tpl = Templates["display/bin.html"] + lines = strings.Split(extra["contents"], "\n") + tpl = Templates["display/story.html"] } } - } else if extension == "story" { + } else if strings.HasPrefix(metadata.Mimetype, "text/") || supportedBinExtension(extension) { if metadata.Size < maxDisplayFileSizeBytes { bytes, err := ioutil.ReadFile(filePath) if err == nil { + extra["extension"] = extension + extra["lang_hl"], extra["lang_ace"] = extensionToHlAndAceLangs(extension) extra["contents"] = string(bytes) - lines = strings.Split(extra["contents"], "\n") - tpl = Templates["display/story.html"] + tpl = Templates["display/bin.html"] } } } else if extension == "md" {