Maxim Sokhatsky 11 лет назад
Родитель
Сommit
6d1f23322d

+ 7 - 3
apps/web/priv/static/app/js/bootloader.js

@@ -161,9 +161,13 @@ function onPlayerInfoClose(evt) { document.getElementById('Player-Statistics').s
 
 // Run
 
-loadFile('Kakaranet-Scene.svg', function() { 
-    loadFile("svg/Discarder.svg", function() {
+$.load('Kakaranet-Scene.svg', function(html) { 
+    var name = "Refined";
+    var slot = document.getElementById(name);
+    if (slot == null) return;
+    slot.parentNode.replaceChild(svg(html),slot);
+    $.load("svg/Discarder.svg", function(h) {
         PatchSVG(),
         StartApp(); 
     });
-}, "Refined");
+});

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

@@ -207,10 +207,10 @@ function PostLoad()
     $("#Pause").on("click", function() { apiProvider.pause(); });
 
     var whoPausedGame = false;
-
-    //$overlay = $("#overlay");
-//    $overlay.on("click", function() { whoPausedGame == scope.user && apiProvider.pause(!0); });
 /*
+    $overlay = $("#overlay");
+    $overlay.on("click", function() { whoPausedGame == scope.user && apiProvider.pause(!0); });
+
     apiProvider.on("game_paused", function(e) {
         if (whoPausedGame = e.detail[3], "pause" == e.detail[2]) {
             $overlay.show();
@@ -264,7 +264,7 @@ function initOkeyScene(e)
 
     e.detail.whos_move && "null" != e.detail.whos_move && 
         (e.detail.next_turn_in && "null" != e.detail.next_turn_in && playersMap[e.detail.whos_move].timer.from(e.detail.next_turn_in),
-         e.detail.paused && (playersMap[e.detail.whos_move].timer.pause(),$overlay.show()),
+         e.detail.paused && (playersMap[e.detail.whos_move].timer.pause()/*,$overlay.show()*/),
          playersMap[e.detail.whos_move].select());
 }