Browse Source

fb sdk up to 2.8. remove deprecated channel settings

Andrii Zadorozhnii 8 years ago
parent
commit
8c51126596
2 changed files with 12 additions and 12 deletions
  1. 10 9
      priv/facebook_sdk.dtl
  2. 2 3
      src/facebook.erl

+ 10 - 9
priv/facebook_sdk.dtl

@@ -1,11 +1,11 @@
 <script>
 window.fbAsyncInit = function() {
-  FB.init({ appId: '{{appid}}', channelUrl: ' {{channelUrl}}', status: true, cookie: true, xfbml: true, oauth: true });
+  FB.init({appId: '{{appid}}',cookie: true,status: true,xfbml: false,version: 'v2.8'});
 
   FB.getLoginStatus(function(response) {
-      var inIframe= top!=self;
-      if(inIframe && response.status == 'connected' && fbLogin)
-        FB.api("/me?fields=id,first_name,last_name,email,birthday,cover", function(response){ fbLogin(response);});
+    var inIframe= top!=self;
+    if(inIframe && response.status == 'connected' && fbLogin)
+      FB.api("/me?fields=id,first_name,last_name,email,birthday,cover", function(response){ fbLogin(response);});
   });
 };
 
@@ -19,10 +19,11 @@ function fb_login(){
   });
 }
 
-(function(d){
-  var js, id = 'facebook-jssdk', ref = d.getElementsByTagName('script')[0];
+(function(d, s, id){
+  var js, fjs = d.getElementsByTagName(s)[0];
   if (d.getElementById(id)) {return;}
-  js = d.createElement('script'); js.id = id; js.async = true; js.src = "//connect.facebook.net/en_US/all.js?v=2";
-  ref.parentNode.insertBefore(js, ref);
-}(document));
+  js = d.createElement(s); js.id = id; js.async = true;
+  js.src = "//connect.facebook.net/en_US/sdk.js";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));
 </script>

+ 2 - 3
src/facebook.erl

@@ -8,8 +8,7 @@
 -compile(export_all).
 -export(?API).
 
--define(HTTP_ADDRESS, application:get_env(web, http_address, [])).
--define(FB_APP_ID,    application:get_env(web, fb_id,        [])).
+-define(FB_APP_ID,    application:get_env(avz, fb_id,        [])).
 
 callback() -> ok.
 event({facebook,_Event}) -> wf:wire("fb_login();"), ok.
@@ -48,4 +47,4 @@ sdk() ->
     wf:wire(#api{name=fbAutoLogin, tag=fb}),
     wf:wire(#api{name=fbLogin, tag=fb}),
     [ #dtl{bind_script=false, file="facebook_sdk", ext="dtl", folder="priv/static/js",
-        bindings=[{appid, ?FB_APP_ID},{channelUrl, ?HTTP_ADDRESS ++ "/static/channel.html"} ] } ].
+        bindings=[{appid, ?FB_APP_ID}] } ].