diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-11-28 10:24:09 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-11-28 10:26:23 +0100 |
| commit | 2caa185504ec697b96b7bf28dd9d15d489777abf (patch) | |
| tree | eb31db743b9d850bd1c0566754cbebdb4521dba0 | |
| parent | db45ea9d8cb8fd199de2239b6bc28aff3ad53cce (diff) | |
| download | hakyll-2caa185504ec697b96b7bf28dd9d15d489777abf.tar.gz | |
Minimize <img>, patch by Chris Mears
Conflicts:
tests/Hakyll/Web/Urls/Relativize/Tests.hs
| -rw-r--r-- | src/Hakyll/Web/Urls.hs | 3 | ||||
| -rw-r--r-- | tests/Hakyll/Web/Urls/Relativize/Tests.hs | 3 | ||||
| -rw-r--r-- | tests/Hakyll/Web/Urls/Tests.hs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Hakyll/Web/Urls.hs b/src/Hakyll/Web/Urls.hs index e89bd08..1cd0816 100644 --- a/src/Hakyll/Web/Urls.hs +++ b/src/Hakyll/Web/Urls.hs @@ -29,7 +29,8 @@ withUrls f = renderTags' . map tag . TS.parseTags -- renderTags' :: [TS.Tag String] -> String renderTags' = TS.renderTagsOptions TS.renderOptions - { TS.optRawTag = (`elem` ["script", "style"]) . map toLower + { TS.optRawTag = (`elem` ["script", "style"]) . map toLower + , TS.optMinimize = (`elem` ["br", "img"]) } -- | Convert a filepath to an URL starting from the site root diff --git a/tests/Hakyll/Web/Urls/Relativize/Tests.hs b/tests/Hakyll/Web/Urls/Relativize/Tests.hs index e14a2a4..802a1ca 100644 --- a/tests/Hakyll/Web/Urls/Relativize/Tests.hs +++ b/tests/Hakyll/Web/Urls/Relativize/Tests.hs @@ -9,7 +9,6 @@ module Hakyll.Web.Urls.Relativize.Tests import Test.Framework (Test, testGroup) import Test.HUnit ((@=?)) - -------------------------------------------------------------------------------- import Hakyll.Web.Urls.Relativize import TestSuite.Util @@ -21,7 +20,7 @@ tests = testGroup "Hakyll.Web.Urls.Relativize.Tests" $ fromAssertions "relativizeUrls" [ "<a href=\"../foo\">bar</a>" @=? relativizeUrlsWith ".." "<a href=\"/foo\">bar</a>" - , "<img src=\"../../images/lolcat.png\"></img>" @=? + , "<img src=\"../../images/lolcat.png\" />" @=? relativizeUrlsWith "../.." "<img src=\"/images/lolcat.png\" />" , "<a href=\"http://haskell.org\">Haskell</a>" @=? relativizeUrlsWith "../.." diff --git a/tests/Hakyll/Web/Urls/Tests.hs b/tests/Hakyll/Web/Urls/Tests.hs index 56a1838..648f308 100644 --- a/tests/Hakyll/Web/Urls/Tests.hs +++ b/tests/Hakyll/Web/Urls/Tests.hs @@ -21,8 +21,8 @@ tests = testGroup "Hakyll.Web.Urls.Tests" $ concat [ fromAssertions "withUrls" [ "<a href=\"FOO\">bar</a>" @=? withUrls (map toUpper) "<a href=\"foo\">bar</a>" - , "<img src=\"OH BAR\">" @=? - withUrls (map toUpper) "<img src=\"oh bar\">" + , "<img src=\"OH BAR\" />" @=? + withUrls (map toUpper) "<img src=\"oh bar\" />" -- Test escaping , "<script>\"sup\"</script>" @=? |