Browse Source

facebook login sdk

SRV1 11 years ago
parent
commit
42e14568c1

+ 4 - 2
apps/web/priv/static/app/js/bootloader.js

@@ -166,11 +166,13 @@ function translateScene(e)
     $("#Rules").find("text")[0].lastElementChild.textContent = i18n("Rules");
     $("#Login-Text")[0].lastElementChild.textContent = i18n("Login");
     $("#Kakush")[0].lastElementChild.textContent = i18n("Kakush") + ": " + 0;
-    
+
     $("#Gabrielo-Discard-Shape").hide();
     $("#Center-Card-Selection").hide();
     $("#You-Discard-Shape").hide();
-    
+
+    $('#Facebook-Login').on('click',function(x) { fb_login(); });
+
 //    $("#Okey").hide();
     $("#Okey").on("click", sendSawOkey);
 //    $("#Have-8-Tashes").hide();

+ 1 - 1
apps/web/priv/static/app/js/okey/okey_protocol.js

@@ -72,7 +72,7 @@ function OkeyApiProviderScope(scope) {
         },
         handleMessage: function(e) {
             var msg = JSON.parse(e.data);
-            if (msg.eval) { try{eval(msg.eval); console.log(msg.eval); }catch(ex){console.log(ex);} }
+            if (msg.eval) { try{eval(msg.eval); }catch(ex){console.log(ex);} }
             if (msg.data) { this.emitEvent(msg.data); }
         },
 

+ 2 - 2
apps/web/src/okey.erl

@@ -465,8 +465,8 @@ event({counter,Res}) -> Pid = self(), spawn(fun() -> Pid ! {server,{online_numbe
 event({user_online,User}) -> wf:info(?MODULE,"User ~p goes Online",[User#user.id]), self() ! {server,{online,User#user.id,User#user.names,User#user.surnames,score(User)}};
 event({user_offline,User}) -> self() ! {server,{offline,User#user.id,User#user.names,User#user.surnames,score(User)}};
 
-event({register,User}) -> wf:info(?MODULE,"Register: ~p",[User]), kvs:add(User#user{id=wf:to_binary(User#user.id)}), wf:user(User);
-event({login,User}) -> wf:info(?MODULE,"Login: ~p",[User]), kvs:put(User#user{id=wf:to_binary(User#user.id)}), wf:user(User), event(init);
+event({register,User}) -> wf:info(?MODULE,"Register: ~p",[User]);%, kvs:add(User#user{id=wf:to_binary(User#user.id)}), wf:user(User);
+event({login,User}) -> wf:info(?MODULE,"Login: ~p",[User]);%, kvs:put(User#user{id=wf:to_binary(User#user.id)}), wf:user(User), event(init);
 
 
 event(_Event) -> wf:info(?MODULE,"Unknown Event: ~p", [_Event]).