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

any player can unpause the game #21

Maxim Sokhatsky 11 лет назад
Родитель
Сommit
406a36fa1c
2 измененных файлов с 17 добавлено и 10 удалено
  1. 1 1
      apps/web/priv/static/app/js/bootloader.js
  2. 16 9
      apps/web/priv/static/app/js/okey/okey.js

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

@@ -201,7 +201,7 @@ function initPauseOverlay() {
     var html = '<g xmlns="http://www.w3.org/2000/svg" id="overlay" style="display:none;">'+
         '<rect x="216" y="91" stroke-width="0" stroke="red" width="641" height="367" rx="6" fill="white" opacity="0.7"></rect>'+
         '<g>'+
-        '<text fill="blue" font-family="Exo 2" y="280" x="-116" text-anchor="middle" dx="641" font-size="26pt"> Someone paused the game</text></g>'+
+        '<text fill="#3B5998" font-family="Exo 2" y="280" x="-116" text-anchor="middle" dx="641" font-size="26pt"> Someone paused the game</text></g>'+
         '</g>';
     var page = document.getElementById("Kakaranet-12-maxim");
     var kakush = document.getElementById("Kakush");

+ 16 - 9
apps/web/priv/static/app/js/okey/okey.js

@@ -229,24 +229,30 @@ function PostLoad()
     });
 
     $("#Pause").on("click", function() { apiProvider.pause(); });
+    $("#Pause").attr({cursor: "pointer"});
 
     var whoPausedGame = false;
 
     $overlay = $("#overlay");
+    $overlay.attr({cursor: "pointer"});
     $overlay.on("click", function() {
         apiProvider.pause(scope.paused); });
 
+    function unpause() {
+        $overlay.hide();
+        for (var player in playersMap) playersMap[player].timer.resume();
+    }
+
+    function pause() {
+        $overlay.show();
+        for (var player in playersMap) playersMap[player].timer.pause();
+        var player = playersMap[e.detail[3]];
+        $overlay.find("text").text(player.name + " paused the game");
+    }
+
     apiProvider.on("game_paused", function(x) {
         var e = {detail: x.detail.json, raw: x.detail.bert};
-        if (whoPausedGame = e.detail[3], "pause" == e.detail[2]) {
-            $overlay.show();
-            for (var player in playersMap) playersMap[player].timer.pause();
-            var player = playersMap[e.detail[3]];
-            $overlay.find("text").text(player.name + "\n paused the game");
-        } else {
-            $overlay.hide();
-            for (var player in playersMap) playersMap[player].timer.resume();
-        }
+        if ("pause" == e.detail[2]) pause(); else unpause();
     });
 
     $("#Table-Oval").droppable({
@@ -259,6 +265,7 @@ function PostLoad()
         }
     });
 
+
 function initOkeyScene(x)
 {
     var e = {detail: x.detail.json, raw: x.detail.bert};