git.iko.soy/jsaddle
on master help sign in
Change type of jsaddleJs back and add jsaddleJs'
ed907e5Hamish Mackenzie
jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets.hs+8−5
compare with master
unifiedsplit
@@ -124,7 +124,7 @@ jsaddleOr opts entryPoint otherApp = do
124
124
125
125
126jsaddleApp :: Application
126jsaddleApp :: Application
127−jsaddleApp = jsaddleAppWithJs $ jsaddleJs Nothing False
127+jsaddleApp = jsaddleAppWithJs $ jsaddleJs False
128
128
129jsaddleAppWithJs :: ByteString -> Application
129jsaddleAppWithJs :: ByteString -> Application
130jsaddleAppWithJs js req sendResponse =
130jsaddleAppWithJs js req sendResponse =
@@ -138,7 +138,7 @@ jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sen
138 (jsaddleAppPartial req sendResponse))
138 (jsaddleAppPartial req sendResponse))
139
139
140jsaddleAppPartial :: Request -> (Response -> IO ResponseReceived) -> Maybe (IO ResponseReceived)
140jsaddleAppPartial :: Request -> (Response -> IO ResponseReceived) -> Maybe (IO ResponseReceived)
141−jsaddleAppPartial = jsaddleAppPartialWithJs $ jsaddleJs Nothing False
141+jsaddleAppPartial = jsaddleAppPartialWithJs $ jsaddleJs False
142
142
143indexResponse :: Response
143indexResponse :: Response
144indexResponse = W.responseLBS H.status200 [("Content-Type", "text/html")] indexHtml
144indexResponse = W.responseLBS H.status200 [("Content-Type", "text/html")] indexHtml
@@ -149,10 +149,13 @@ jsaddleAppPartialWithJs js req sendResponse = case (W.requestMethod req, W.pathI
149 ("GET", ["jsaddle.js"]) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/javascript")] js
149 ("GET", ["jsaddle.js"]) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/javascript")] js
150 _ -> Nothing
150 _ -> Nothing
151
151
152+jsaddleJs :: Bool -> ByteString
153+jsaddleJs = jsaddleJs' Nothing
154+
152-- Use this to generate this string for embedding
155-- Use this to generate this string for embedding
153-- sed -e 's|\\|\\\\|g' -e 's|^| \\|' -e 's|$|\\n\\|' -e 's|"|\\"|g' data/jsaddle.js | pbcopy
156-- sed -e 's|\\|\\\\|g' -e 's|^| \\|' -e 's|$|\\n\\|' -e 's|"|\\"|g' data/jsaddle.js | pbcopy
154−jsaddleJs :: Maybe ByteString -> Bool -> ByteString
157+jsaddleJs' :: Maybe ByteString -> Bool -> ByteString
155−jsaddleJs jsaddleUri refreshOnLoad = "\
158+jsaddleJs' jsaddleUri refreshOnLoad = "\
156 \if(typeof global !== \"undefined\") {\n\
159 \if(typeof global !== \"undefined\") {\n\
157 \ global.window = global;\n\
160 \ global.window = global;\n\
158 \ global.WebSocket = require('ws');\n\
161 \ global.WebSocket = require('ws');\n\
@@ -216,7 +219,7 @@ debug :: Int -> JSM () -> IO ()
216debug port f = do
219debug port f = do
217 debugWrapper $ \withRefresh registerContext ->
220 debugWrapper $ \withRefresh registerContext ->
218 runSettings (setPort port (setTimeout 3600 defaultSettings)) =<<
221 runSettings (setPort port (setTimeout 3600 defaultSettings)) =<<
219− jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJs $ jsaddleJs Nothing True)
222+ jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJs $ jsaddleJs True)
220 putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
223 putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
221
224
222refreshMiddleware :: ((Response -> IO ResponseReceived) -> IO ResponseReceived) -> Middleware
225refreshMiddleware :: ((Response -> IO ResponseReceived) -> IO ResponseReceived) -> Middleware