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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michael Snoyman 2012-04-19 07:59:06 +03:00
commit 9fbd9d239d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-default/Yesod/Default/Util.hs
View File

@ -73,8 +73,8 @@ widgetFileReload x = combine "widgetFileReload" x
, whenExists x True "lucius" luciusFileReload , whenExists x True "lucius" luciusFileReload
] ]
widgetFileJsCss :: (String, FilePath -> Q Exp) -- ^ Css file extenstion and loading function. example: ("cassius", cassiusFileReload) widgetFileJsCss :: (String, FilePath -> Q Exp) -- ^ JavaScript file extenstion and loading function. example: ("julius", juliusFileReload)
-> (String, FilePath -> Q Exp) -- ^ Css file extenstion and loading function. example: ("julius", juliusFileReload) -> (String, FilePath -> Q Exp) -- ^ Css file extenstion and loading function. example: ("cassius", cassiusFileReload)
-> FilePath -> Q Exp -> FilePath -> Q Exp
widgetFileJsCss (jsExt, jsLoad) (csExt, csLoad) x = combine "widgetFileJsCss" x widgetFileJsCss (jsExt, jsLoad) (csExt, csLoad) x = combine "widgetFileJsCss" x
[ whenExists x False "hamlet" whamletFile [ whenExists x False "hamlet" whamletFile

1
yesod/scaffold/Application.hs.cg
View File

@ -21,6 +21,7 @@ import qualified Database.Persist.Store~importMigration~
import Network.HTTP.Conduit (newManager, def) import Network.HTTP.Conduit (newManager, def)
-- Import all relevant handler modules here. -- Import all relevant handler modules here.
-- Don't forget to add new modules to your cabal file!
import Handler.Home import Handler.Home
-- This line actually creates our YesodSite instance. It is the second half -- This line actually creates our YesodSite instance. It is the second half