haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Yesod.Static

Browse Source
This commit is contained in:
Michael Snoyman 2013-03-14 19:02:30 +02:00
parent 44a01d7107
commit 2d93157e9a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yesod-static/Yesod/Static.hs
View File

@ -5,6 +5,7 @@
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}
--------------------------------------------------------- ---------------------------------------------------------
-- --
-- | Serve static files from a Yesod app. -- | Serve static files from a Yesod app.
@ -69,7 +70,6 @@ import qualified Data.Serialize
import Data.Text (Text, pack) import Data.Text (Text, pack)
import qualified Data.Map as M import qualified Data.Map as M
import Data.IORef (readIORef, newIORef, writeIORef) import Data.IORef (readIORef, newIORef, writeIORef)
import Network.Wai (pathInfo)
import Data.Char (isLower, isDigit) import Data.Char (isLower, isDigit)
import Data.List (foldl') import Data.List (foldl')
import qualified Data.ByteString as S import qualified Data.ByteString as S
@ -144,10 +144,10 @@ instance RenderRoute Static where
renderRoute (StaticRoute x y) = (x, y) renderRoute (StaticRoute x y) = (x, y)
instance YesodSubDispatch Static m where instance YesodSubDispatch Static m where
yesodSubDispatch _run getSub _toMaster env req = yesodSubDispatch YesodSubRunnerEnv {..} req =
staticApp set req staticApp set req
where where
Static set = getSub $ yreSite env Static set = ysreGetSub $ yreSite $ ysreParentEnv
notHidden :: Prelude.FilePath -> Bool notHidden :: Prelude.FilePath -> Bool
notHidden "tmp" = False notHidden "tmp" = False

1
yesod-static/sample.hs
View File

@ -1,7 +1,6 @@
{-# LANGUAGE QuasiQuotes, TypeFamilies, MultiParamTypeClasses #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, MultiParamTypeClasses #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
import Yesod.Static import Yesod.Static
import Yesod.Dispatch
import Yesod.Core import Yesod.Core
import Network.Wai.Handler.Warp (run) import Network.Wai.Handler.Warp (run)
import Network.Wai.Application.Static import Network.Wai.Application.Static