Merge pull request #1360 from dfordivam/master

Fix yesod-websockets/sample.hs example
This commit is contained in:
Michael Snoyman 2017-03-15 06:29:29 +02:00 committed by GitHub
commit c91f92a829

View File

@ -3,10 +3,10 @@ import Yesod.Core
import Yesod.WebSockets import Yesod.WebSockets
import qualified Data.Text.Lazy as TL import qualified Data.Text.Lazy as TL
import Control.Monad (forever) import Control.Monad (forever)
import Control.Monad.Trans.Reader
import Control.Concurrent (threadDelay) import Control.Concurrent (threadDelay)
import Data.Time import Data.Time
import Conduit import Data.Conduit
import qualified Data.Conduit.List
data App = App data App = App
@ -25,7 +25,7 @@ timeSource = forever $ do
getHomeR :: Handler Html getHomeR :: Handler Html
getHomeR = do getHomeR = do
webSockets $ race_ webSockets $ race_
(sourceWS $$ mapC TL.toUpper =$ sinkWSText) (sourceWS $$ Data.Conduit.List.map TL.toUpper =$ sinkWSText)
(timeSource $$ sinkWSText) (timeSource $$ sinkWSText)
defaultLayout $ defaultLayout $
toWidget toWidget
@ -43,6 +43,9 @@ getHomeR = do
conn.onmessage = function(e) { conn.onmessage = function(e) {
document.write("<p>" + e.data + "</p>"); document.write("<p>" + e.data + "</p>");
}; };
conn.onclose = function () {
document.write("<p>Connection Closed</p>");
};
|] |]
main :: IO () main :: IO ()