Merge branch 'master' of github.com:jeena/GGS

2011-01-25 16:03:30 +01:00 · 2011-01-25 16:03:30 +01:00 · 3ca41bc676
commit 3ca41bc676
parent a4f7774143 ee97a0b044
3 changed files with 2 additions and 2 deletions
--- a/js_runner.erl
+++ b/js_runner.erl
@ -8,4 +8,4 @@ boot() ->

 executeJS(Port, Data) ->
    ok = js:define(Port, <<"function helloworld(name){return 'Hello, ' + name}">>),
-    js:call(Port, <<"helloworld">>, [Data]).
+    js:call(Port, <<"helloworld">>, [list_to_binary(Data)]).
--- a/src/.ggs_server.erl.swo
+++ b/src/.ggs_server.erl.swo