Home Explore Help
Sign In
n4u
/
mad
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

make n2o_sample working with n2o master

Maxim Sokhatsky 10 years ago
parent
52aef25f30
commit
5542281935
4 changed files with 24 additions and 10 deletions
Unified View Show Diff Stats
  1. BIN
      mad
  2. 12 4
      priv/web/apps/n2o_sample/priv/static/spa/index.htm
  3. 10 4
      priv/web/apps/n2o_sample/priv/templates/index.html
  4. 2 2
      priv/web/apps/n2o_sample/src/routes.erl

BIN
mad
View File


+ 12 - 4
priv/web/apps/n2o_sample/priv/static/spa/index.htm
View File 

@@ -8,10 +8,18 @@
 
 <div id="history"></div>
 
 <div id="history"></div>
 
 <input id="message" type="text">
 
 <input id="message" type="text">
 
 <button id="send" type="button">Chat</button>
 
 <button id="send" type="button">Chat</button>
 
-<script>var transition = {pid: '', port:'8000'}</script>
 
-<script src='/n2o/bullet.js' type='text/javascript' charset='utf-8'></script>
 
-<script src='/n2o/n2o.js' type='text/javascript' charset='utf-8'></script>
 
-<script src='/n2o/bert.js' type='text/javascript' charset='utf-8'></script>
 
+    <script src='/n2o/protocols/bert.js'></script>
 
+    <script src='/n2o/protocols/binary.js'></script>
 
+    <script src='/n2o/protocols/client.js'></script>
 
+    <script src='/n2o/protocols/nitrogen.js'></script>
 
+    <script src='/n2o/bullet.js'></script>
 
+    <script src='/n2o/utf8.js'></script>
 
+    <script src='/n2o/template.js'></script>
 
+    <script src='/n2o/n2o.js'></script>
 
+<script>
 
+  var transition = {pid: '', port:'8000'}; 
+      protos = [ $client ];
 
+      N2O_start();</script>
 
 </script><div id="n2ostatus"></div>
 
 </script><div id="n2ostatus"></div>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 10 - 4
priv/web/apps/n2o_sample/priv/templates/index.html
View File 

@@ -7,9 +7,15 @@
 
 <body>
 
 <body>
 
 {{body}}
 
 {{body}}
 
 <script>{{script}}</script>
 
 <script>{{script}}</script>
 
-<script src='/n2o/bert.js' type='text/javascript' charset='utf-8'></script>
 
-<script src='/n2o/bullet.js' type='text/javascript' charset='utf-8'></script>
 
-<script src='/n2o/n2o.js' type='text/javascript' charset='utf-8'></script>
 
-<div id="n2ostatus"></div>
 
+    <script src='/n2o/protocols/bert.js'></script>
 
+    <script src='/n2o/protocols/binary.js'></script>
 
+    <script src='/n2o/protocols/client.js'></script>
 
+    <script src='/n2o/protocols/nitrogen.js'></script>
 
+    <script src='/n2o/bullet.js'></script>
 
+    <script src='/n2o/utf8.js'></script>
 
+    <script src='/n2o/template.js'></script>
 
+    <script src='/n2o/n2o.js'></script>
 
+<script>protos = [ $client ]; N2O_start();
 
+</script><div id="n2ostatus"></div>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 2 - 2
priv/web/apps/n2o_sample/src/routes.erl
View File 

@@ -5,9 +5,9 @@
 
 
 
 finish(State, Ctx) -> {ok, State, Ctx}.
 
 finish(State, Ctx) -> {ok, State, Ctx}.
 
 init(State, Ctx) -> 
 init(State, Ctx) -> 
-    Path = wf:path(Ctx#context.req),
 
+    Path = wf:path(Ctx#cx.req),
 
     wf:info(?MODULE,"Route: ~p~n",[Path]),
 
     wf:info(?MODULE,"Route: ~p~n",[Path]),
 
-    {ok, State, Ctx#context{path=Path,module=route_prefix(Path)}}.
 
+    {ok, State, Ctx#cx{path=Path,module=route_prefix(Path)}}.
 
 
 
 route_prefix(<<"/ws/",P/binary>>) -> route(P);
 
 route_prefix(<<"/ws/",P/binary>>) -> route(P);
 
 route_prefix(<<"/",P/binary>>) -> route(P);
 
 route_prefix(<<"/",P/binary>>) -> route(P);