git.iko.soy/obelisk
on master help sign in
Fixing references to static files.

- renderJsaddleFrontend was missing the neede base tag - renderGhcjsFrontend had the base tag, but did put them after the headers of the frontend, so any references in the frontend header would not be based on the base tag.

commitb2f2025bc2ebad5892fde3318f867080ff5e3b74 authorRobert Klotzner <robert.klotzner@gmx.at> dateThu 14 Feb 2019, 16:58 (8 years ago) parentfb0473a
2 files changed+3−2
compare with master
unifiedsplit
lib/backend/src/Obelisk/Backend.hs+1−1 lib/run/src/Obelisk/Run.hs+2−1
lib/backend/src/Obelisk/Backend.hs+1−1
@@ -171,5 +171,5 @@ renderGhcjsFrontend urlEnc route f = do
171171 ghcjsPreload = elAttr "link" ("rel" =: "preload" <> "as" =: "script" <> "href" =: "ghcjs/all.js") blank
172172 ghcjsScript = elAttr "script" ("language" =: "javascript" <> "src" =: "ghcjs/all.js" <> "defer" =: "defer") blank
173173 liftIO $ renderFrontendHtml urlEnc route
174− (_frontend_head f >> injectExecutableConfigs >> baseTag >> ghcjsPreload)
174+ (baseTag >> _frontend_head f >> injectExecutableConfigs >> ghcjsPreload)
175175 (_frontend_body f >> ghcjsScript)
lib/run/src/Obelisk/Run.hs+2−1
@@ -152,7 +152,8 @@ renderJsaddleFrontend :: (route -> Text) -> route -> Frontend route -> IO ByteSt
152152renderJsaddleFrontend urlEnc r f =
153153 let jsaddleScript = elAttr "script" ("src" =: "/jsaddle/jsaddle.js") blank
154154 jsaddlePreload = elAttr "link" ("rel" =: "preload" <> "as" =: "script" <> "href" =: "/jsaddle/jsaddle.js") blank
155− in renderFrontendHtml urlEnc r (_frontend_head f >> injectExecutableConfigs >> jsaddlePreload) (_frontend_body f >> jsaddleScript)
155+ baseTag = elAttr "base" ("href" =: "/") blank --TODO: Figure out the base URL from the routes
156+ in renderFrontendHtml urlEnc r (baseTag >> _frontend_head f >> injectExecutableConfigs >> jsaddlePreload) (_frontend_body f >> jsaddleScript)
156157
157158-- | like 'bindPortTCP' but reconnects on exception
158159bindPortTCPRetry :: Settings