Просмотр исходного кода

fix utf8 bug with left players

SRV1 11 лет назад
Родитель
Сommit
5d728def18
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      apps/web/priv/static/app/js/n2o/facebook.js
  2. 1 1
      apps/web/priv/static/app/js/okey/okey.js

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

@@ -4,7 +4,7 @@
 utf8 = { toByteArray: utf8toByteArray };
 utf8 = { toByteArray: utf8toByteArray };
 
 
   window.fbAsyncInit = function() {
   window.fbAsyncInit = function() {
-  FB.init({ appId: "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) {
   FB.getLoginStatus(function(response) {
 //    if(setFbIframe){
 //    if(setFbIframe){

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

@@ -258,7 +258,7 @@ function PostLoad()
         var playerInfo = dec(e.raw).value[0][3][2].value[0][1].value[0];
         var playerInfo = dec(e.raw).value[0][3][2].value[0][1].value[0];
         scope.playersMap[playerInfo[1].value] = new scope.Player({
         scope.playersMap[playerInfo[1].value] = new scope.Player({
             position: scope.playersMap[player].position,
             position: scope.playersMap[player].position,
-            name: [ playerInfo[3].value, playerInfo[4].value ].join(" "),
+            name: [ utf8decode(playerInfo[3].value), utf8decode(playerInfo[4].value) ].join(" "),
             noSkin: !0
             noSkin: !0
         }),
         }),