Browse Source

fix windows chrome facebook app

SRV1 10 years ago
parent
commit
cb7bbc9d42
2 changed files with 34 additions and 25 deletions
  1. 17 17
      apps/web/priv/static/app/index.htm
  2. 17 8
      apps/web/priv/static/app/js/n2o/facebook.js

+ 17 - 17
apps/web/priv/static/app/index.htm

@@ -13,26 +13,26 @@
 
     <svg id="Refined" style="top:0; left:0; height:100%; width:100%;"></svg>
 
-    <script src="js/n2o/bert.js?v=3"></script>
-    <script src="js/n2o/bullet.js?v=3"></script>
-    <script src="js/n2o/facebook.js?v=3"></script>
+    <script src="js/n2o/bert.js?v=4"></script>
+    <script src="js/n2o/bullet.js?v=4"></script>
+    <script src="js/n2o/facebook.js?v=4"></script>
 
-    <script src="js/selector.js?v=3"></script>
-    <script src="js/controller.js?v=3"></script>
-    <script src="js/dragndrop.js?v=3"></script>
-    <script src="js/timer.js?v=3"></script>
-    <script src="js/player.js?v=3"></script>
-    <script src="js/chat.js?v=3"></script>
-    <script src="js/roster.js?v=3"></script>
-    <script src="js/translations.js?v=3"></script>
+    <script src="js/selector.js?v=4"></script>
+    <script src="js/controller.js?v=4"></script>
+    <script src="js/dragndrop.js?v=4"></script>
+    <script src="js/timer.js?v=4"></script>
+    <script src="js/player.js?v=4"></script>
+    <script src="js/chat.js?v=4"></script>
+    <script src="js/roster.js?v=4"></script>
+    <script src="js/translations.js?v=4"></script>
 
-    <script src="js/okey/okey_protocol.js?v=3"></script>
-    <script src="js/okey/hand.js?v=3"></script>
-    <script src="js/okey/card.js?v=3"></script>
-    <script src="js/okey/deck.js?v=3"></script>
-    <script src="js/okey/okey.js?v=3"></script>
+    <script src="js/okey/okey_protocol.js?v=4"></script>
+    <script src="js/okey/hand.js?v=4"></script>
+    <script src="js/okey/card.js?v=4"></script>
+    <script src="js/okey/deck.js?v=4"></script>
+    <script src="js/okey/okey.js?v=4"></script>
 
-    <script src="js/bootloader.js?v=3"></script>
+    <script src="js/bootloader.js?v=4"></script>
 
 </body>
 </html>

+ 17 - 8
apps/web/priv/static/app/js/n2o/facebook.js

@@ -4,24 +4,31 @@
 utf8 = { toByteArray: utf8toByteArray };
 
   window.fbAsyncInit = function() {
-  FB.init({ appId: /* "559978657446014" */ "154227314626053", channelUrl: 'http://kakaranet.com/channel.html', status: true, cookie: true, xfbml: true, oauth: true });
+  FB.init({ appId: /* "559978657446014" */ "154227314626053",
+            channelUrl: 'http://kakaranet.com/channel.html',
+            status: true, cookie: true, xfbml: true, oauth: true });
 
   FB.getLoginStatus(function(response) {
-//    if(setFbIframe){
+    if(setFbIframe){
       var inIframe= top!=self;
-  //    setFbIframe(inIframe);
+      setFbIframe(inIframe);
       if(inIframe && response.status == 'connected' && fbLogin)
-        FB.api("/me?fields=id,username,first_name,gender,last_name,email,birthday", function(response){ fbLogin(response);});
-  //  }
+        FB.api("/me?fields=id,username,first_name,gender,last_name,email,birthday", 
+          function(response){ fbLogin(response);});
+    }
   });
 };
 
 function fb_login(){
   FB.getLoginStatus(function(response){
     if(response.status == 'connected'){
-      if(fbLogin) FB.api("/me?fields=id,username,gender,first_name,last_name,email,birthday", function(response){fbLogin(response);});
+      if(fbLogin) 
+        FB.api("/me?fields=id,username,gender,first_name,last_name,email,birthday", 
+           function(response){fbLogin(response);});
     } else FB.login(function(r){
-        if(r.authResponse && fbLogin) FB.api("/me?fields=id,gender,username,first_name,last_name,email,birthday", function(response){fbLogin(response);});
+        if(r.authResponse && fbLogin) 
+           FB.api("/me?fields=id,gender,username,first_name,last_name,email,birthday",
+           function(response){ fbLogin(response);});
       }, {scope: 'email,user_birthday'});
   });
 }
@@ -29,6 +36,8 @@ function fb_login(){
 (function(d){
   var js, id = 'facebook-jssdk', ref = d.getElementsByTagName('script')[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";
+  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));
+