direct messages

synrc · Oct 9, 2014 · 0b8ef0f · 0b8ef0f
1 parent 35307ba
commit 0b8ef0f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/priv/n2o.js b/priv/n2o.js
@@ -17,4 +17,4 @@ function N2O_start() {
 }
 
 //WebSocket = undefined; // test XHR fallback
-if (autoinit) N2O_start();
+//if (autoinit) N2O_start();
diff --git a/priv/protocols/bert.js b/priv/protocols/bert.js
@@ -169,7 +169,7 @@ var $bert = {};
 
 $bert.on = function onbert(evt, callback) // BERT formatter
 {
-    console.log("Bert On");
+//    console.log("Bert On");
     var reader = new FileReader();
     reader.addEventListener("loadend", function() {
         try {

diff --git a/priv/protocols/client.js b/priv/protocols/client.js
@@ -7,7 +7,7 @@ $client.on = function onclient(evt, callback) // JSON formatter
 
            if (typeof callback == 'function' && msg.data) callback(msg.data);
 
-//           console.log(msg.eval);
+           console.log(msg.eval);
            if (msg.eval) try { eval(msg.eval); } 
                       catch (e) { return { status: "error", desc: e }; }
 

diff --git a/src/endpoints/n2o_websocket.erl b/src/endpoints/n2o_websocket.erl
@@ -6,9 +6,9 @@
 
 protocols() -> wf:config(n2o,protocols,[ n2o_binary,
                                          n2o_rails,
+                                         n2o_client,
                                          n2o_nitrogen,
-                                         n2o_heart,
-                                         n2o_client
+                                         n2o_heart
                                           ]).
 
 % web server callbacks

diff --git a/src/nitrogen/n2o_nitrogen.erl b/src/nitrogen/n2o_nitrogen.erl
@@ -35,11 +35,11 @@ info({flush,Actions}, Req, State) ->
     wf:info(?MODULE,"Flush Message: ~p",[Actions]),
     {reply, wf:json([{eval,iolist_to_binary(render_actions(Actions))}]), Req, State};
 
-info({delivery,Route,Message}, Req, State) ->
+info({direct,Message}, Req, State) ->
     wf:actions([]),
     Module = State#cx.module,
-    Term = try Module:event({delivery,Route,Message}) catch E:R -> wf:info(?MODULE,"Catch: ~p:~p~n~p", wf:stack(E, R)), <<>> end,
-    wf:info(?MODULE,"Delivery: ~p Result: ~p",[Message,Term]),
+    Term = try Module:event(Message) catch E:R -> wf:info(?MODULE,"Catch: ~p:~p~n~p", wf:stack(E, R)), <<>> end,
+    wf:info(?MODULE,"Direct: ~p Result: ~p",[Message,Term]),
     {reply,wf:json([{eval,iolist_to_binary(render_actions(wf:actions()))}]),Req,State};
 
 info(Message,Req,State) -> {unknown,Message,Req,State}.