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

Javascript in Head (#380)

Browse Source
This commit is contained in:
Michael Snoyman 2012-07-04 17:53:24 +03:00
parent d92d367c2d
commit c611543a6f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-core/Yesod/Widget.hs
View File

@ -152,7 +152,7 @@ instance render ~ RY master => ToWidgetHead sub master (render -> Html) where
instance render ~ RY master => ToWidgetHead sub master (render -> Css) where instance render ~ RY master => ToWidgetHead sub master (render -> Css) where
toWidgetHead = toWidget toWidgetHead = toWidget
instance render ~ RY master => ToWidgetHead sub master (render -> Javascript) where instance render ~ RY master => ToWidgetHead sub master (render -> Javascript) where
toWidgetHead = toWidget toWidgetHead j = toWidgetHead $ \r -> H.script $ preEscapedLazyText $ renderJavascriptUrl r j
instance ToWidgetHead sub master Html where instance ToWidgetHead sub master Html where
toWidgetHead = toWidgetHead . const toWidgetHead = toWidgetHead . const

12
yesod-core/test/YesodCoreTest/Widget.hs
View File

@ -26,6 +26,7 @@ mkYesod "Y" [parseRoutes|
/whamlet WhamletR GET /whamlet WhamletR GET
/towidget TowidgetR GET /towidget TowidgetR GET
/auto AutoR GET /auto AutoR GET
/jshead JSHeadR GET
|] |]
instance Yesod Y where instance Yesod Y where
@ -77,12 +78,16 @@ getAutoR = defaultLayout [whamlet|
where where
someHtml = [shamlet|somehtml|] someHtml = [shamlet|somehtml|]
getJSHeadR :: Handler RepHtml
getJSHeadR = defaultLayout $ toWidgetHead [julius|alert("hello");|]
widgetTest :: Spec widgetTest :: Spec
widgetTest = describe "Test.Widget" widgetTest = describe "Test.Widget"
[ it "addJuliusBody" case_addJuliusBody [ it "addJuliusBody" case_addJuliusBody
, it "whamlet" case_whamlet , it "whamlet" case_whamlet
, it "two letter lang codes" case_two_letter_lang , it "two letter lang codes" case_two_letter_lang
, it "automatically applies toWidget" case_auto , it "automatically applies toWidget" case_auto
, it "toWidgetHead puts JS in head" case_jshead
] ]
runner :: Session () -> IO () runner :: Session () -> IO ()
@ -116,3 +121,10 @@ case_auto = runner $ do
, requestHeaders = [("Accept-Language", "es")] , requestHeaders = [("Accept-Language", "es")]
} }
assertBody "<!DOCTYPE html>\n<html><head><title></title></head><body>somehtml</body></html>" res assertBody "<!DOCTYPE html>\n<html><head><title></title></head><body>somehtml</body></html>" res
case_jshead :: IO ()
case_jshead = runner $ do
res <- request defaultRequest
{ pathInfo = ["jshead"]
}
assertBody "<!DOCTYPE html>\n<html><head><title></title><script>alert(\"hello\");</script></head><body></body></html>" res