Improve Websocket example

ninenines · Feb 9, 2013 · 574c3d4 · 574c3d4
1 parent efbd913
commit 574c3d4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/examples/websocket/priv/html_ws_client.html b/examples/websocket/priv/html_ws_client.html
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <title>Websocket client</title>
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
+    <script src="/static/jquery.min.js"></script>
     <script type="text/javascript">
 
       var websocket;

diff --git a/examples/websocket/priv/static/jquery.min.js b/examples/websocket/priv/static/jquery.min.js
diff --git a/examples/websocket/rebar.config b/examples/websocket/rebar.config
@@ -1,4 +1,6 @@
 {deps, [
 	{cowboy, ".*",
-		{git, "git://github.com/extend/cowboy.git", "master"}}
+		{git, "git://github.com/extend/cowboy.git", "master"}},
+	{mimetypes, ".*",
+		{git, "git://github.com/spawngrid/mimetypes.git", "master"}}
 ]}.
diff --git a/examples/websocket/src/toppage_handler.erl b/examples/websocket/src/toppage_handler.erl
@@ -11,7 +11,9 @@ init(_Transport, Req, []) ->
 
 handle(Req, State) ->
 	Html = get_html(),
-	{ok, Req2} = cowboy_req:reply(200, [], Html, Req),
+	{ok, Req2} = cowboy_req:reply(200,
+		[{<<"content-type">>, <<"text/html">>}],
+		Html, Req),
 	{ok, Req2, State}.
 
 terminate(_Reason, _Req, _State) ->

diff --git a/examples/websocket/src/websocket_app.erl b/examples/websocket/src/websocket_app.erl
@@ -13,7 +13,11 @@ start(_Type, _Args) ->
 	Dispatch = cowboy_router:compile([
 		{'_', [
 			{"/", toppage_handler, []},
-			{"/websocket", ws_handler, []}
+			{"/websocket", ws_handler, []},
+			{"/static/[...]", cowboy_static, [
+				{directory, {priv_dir, websocket, [<<"static">>]}},
+				{mimetypes, {fun mimetypes:path_to_mimes/2, default}}
+			]}
 		]}
 	]),
 	{ok, _} = cowboy:start_http(http, 100, [{port, 8080}],