diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs
index 59d0f844..5dcea990 100644
--- a/yesod-core/Yesod/Widget.hs
+++ b/yesod-core/Yesod/Widget.hs
@@ -152,7 +152,7 @@ instance render ~ RY master => ToWidgetHead sub master (render -> Html) where
instance render ~ RY master => ToWidgetHead sub master (render -> Css) where
toWidgetHead = toWidget
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
toWidgetHead = toWidgetHead . const
diff --git a/yesod-core/test/YesodCoreTest/Widget.hs b/yesod-core/test/YesodCoreTest/Widget.hs
index 055e42dd..35440f19 100644
--- a/yesod-core/test/YesodCoreTest/Widget.hs
+++ b/yesod-core/test/YesodCoreTest/Widget.hs
@@ -26,6 +26,7 @@ mkYesod "Y" [parseRoutes|
/whamlet WhamletR GET
/towidget TowidgetR GET
/auto AutoR GET
+/jshead JSHeadR GET
|]
instance Yesod Y where
@@ -77,12 +78,16 @@ getAutoR = defaultLayout [whamlet|
where
someHtml = [shamlet|somehtml|]
+getJSHeadR :: Handler RepHtml
+getJSHeadR = defaultLayout $ toWidgetHead [julius|alert("hello");|]
+
widgetTest :: Spec
widgetTest = describe "Test.Widget"
[ it "addJuliusBody" case_addJuliusBody
, it "whamlet" case_whamlet
, it "two letter lang codes" case_two_letter_lang
, it "automatically applies toWidget" case_auto
+ , it "toWidgetHead puts JS in head" case_jshead
]
runner :: Session () -> IO ()
@@ -116,3 +121,10 @@ case_auto = runner $ do
, requestHeaders = [("Accept-Language", "es")]
}
assertBody "\nsomehtml" res
+
+case_jshead :: IO ()
+case_jshead = runner $ do
+ res <- request defaultRequest
+ { pathInfo = ["jshead"]
+ }
+ assertBody "\n" res