Browse Source

fix overlay

Maxim Sokhatsky 11 years ago
parent
commit
f4be447a4b

+ 12 - 5
apps/web/priv/static/app/js/bootloader.js

@@ -15,8 +15,6 @@ function statsRow(start_x,start_y,i,games) {
             x: start_x,
             x: start_x,
             y: start_y+25*i,
             y: start_y+25*i,
             body: games[i].value[0][0] + " — " + parseUInt(games[i].value[0][1])});
             body: games[i].value[0][0] + " — " + parseUInt(games[i].value[0][1])});
-    
-    console.log(games[i].value[0][1]);
     var element1 = svg(name);
     var element1 = svg(name);
     document.getElementById('Stat-Right').appendChild(element1);
     document.getElementById('Stat-Right').appendChild(element1);
 }
 }
@@ -269,12 +267,22 @@ function initPauseOverlay() {
     var page = document.getElementById("Kakaranet-12-maxim");
     var page = document.getElementById("Kakaranet-12-maxim");
     var kakush = document.getElementById("Kakush");
     var kakush = document.getElementById("Kakush");
     page.insertBefore(svg(html),kakush);
     page.insertBefore(svg(html),kakush);
+
+    $("#overlay").on("click", hideOverlay);
+
 }
 }
 
 
-function showRoundEnd(o)
+function showRoundEnd(e)
 {
 {
     $overlay.show();
     $overlay.show();
-    $("#Overlay-Text").text(player + " revealed ");
+    var reason = dec(e.raw).value[0][3][1].value[0][1].value;
+    var gameres = dec(e.raw).value[0][3][2].value[0][1];
+    $("#Overlay-Results").empty();
+    for (var i=0;i<gameres.length;i++) { gameresultRow(400,130,i,gameres); }
+    if (reason == "tashes_out") {
+        $("#Overlay-Text").text("Tashes out");
+        $("#RevealDeckRoot").hide();
+    }
 
 
 }
 }
 
 
@@ -299,7 +307,6 @@ function showRevealHand(o) {
             $overlay.append(svg(h));
             $overlay.append(svg(h));
             $reveal_deck = $("#RevealDeck");
             $reveal_deck = $("#RevealDeck");
             $("#RevealDeckRoot").on("click", hideOverlay);
             $("#RevealDeckRoot").on("click", hideOverlay);
-            $overlay.on("click", hideOverlay);
         }
         }
 
 
         $reveal_deck.each(function(card){ card.$el && card.$el.remove(); });
         $reveal_deck.each(function(card){ card.$el && card.$el.remove(); });

+ 6 - 4
apps/web/priv/static/app/js/okey/okey.js

@@ -72,7 +72,7 @@ function PostLoad()
         var playersPositions = scope.playersPositions;
         var playersPositions = scope.playersPositions;
         scope.user = document.user;
         scope.user = document.user;
 
 
-        //$overlay.hide();
+        //$overlay.hide(); // give user an ability to see results
 
 
         if (!scope.started) {
         if (!scope.started) {
 
 
@@ -212,7 +212,7 @@ function PostLoad()
     scope.apiProvider.on("okey_revealed", function(x) {
     scope.apiProvider.on("okey_revealed", function(x) {
         var e = {detail: x.detail.json, raw: x.detail.bert};
         var e = {detail: x.detail.json, raw: x.detail.bert};
         showRevealHand(dec(e.raw));
         showRevealHand(dec(e.raw));
-        scope.ended = !0;//, scope.deck.fill([]);
+//        scope.ended = !0;//, scope.deck.fill([]);
         for (var hand in scope.playersLeftHandsMap) scope.playersLeftHandsMap[hand].clear();
         for (var hand in scope.playersLeftHandsMap) scope.playersLeftHandsMap[hand].clear();
         for (var playerName in scope.playersMap) scope.playersMap[playerName].unselect();
         for (var playerName in scope.playersMap) scope.playersMap[playerName].unselect();
         // $gosterme.remove();
         // $gosterme.remove();
@@ -220,16 +220,18 @@ function PostLoad()
 
 
     scope.apiProvider.on("okey_round_ended", function(x) {
     scope.apiProvider.on("okey_round_ended", function(x) {
         var e = {detail: x.detail.json, raw: x.detail.bert};
         var e = {detail: x.detail.json, raw: x.detail.bert};
+        showRoundEnd(e);
+        /*
         var reason = dec(e.raw).value[0][3][1].value[0][1].value;
         var reason = dec(e.raw).value[0][3][1].value[0][1].value;
         var gameres = dec(e.raw).value[0][3][2].value[0][1];
         var gameres = dec(e.raw).value[0][3][2].value[0][1];
         $("#Overlay-Results").empty();
         $("#Overlay-Results").empty();
         for (var i=0;i<gameres.length;i++) { gameresultRow(400,130,i,gameres); }
         for (var i=0;i<gameres.length;i++) { gameresultRow(400,130,i,gameres); }
         if (reason == "tashes_out") {
         if (reason == "tashes_out") {
-            $("#Overlay-Results").empty();
             $("#Overlay-Text").text("Tashes out");
             $("#Overlay-Text").text("Tashes out");
             $("#RevealDeckRoot").hide();
             $("#RevealDeckRoot").hide();
         }
         }
-
+        */
+        scope.ended = !0;
     });
     });
 
 
     scope.apiProvider.on("player_left", function(x) {
     scope.apiProvider.on("player_left", function(x) {