Browse Source

make a hot client fix for #25

Maxim Sokhatsky 11 years ago
parent
commit
f94e28bad9
1 changed files with 10 additions and 4 deletions
  1. 10 4
      apps/web/priv/static/app/js/okey/okey.js

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

@@ -123,10 +123,11 @@ function PostLoad()
             if (cards.length)
             {
                 var card = cards[cards.length-1];
-                scope.deck.$el.append(card.$el[0]), card.$el.attr({ transform: "translate(16 -65)"}),
-                card.dragHandler.enable(),
+                scope.deck.$el.append(card.$el[0]);
+                card.$el.attr({ transform: "translate(16 -65)"});
+                if ("none" != $("#Okey")[0].style.display) card.dragHandler.enable();
                 card.on("dragstart", scope.deck.select)
-                    .on("dragmove", scope.deck.track)
+                    .on("dragmove", scope.deck.track);
                 card.$el.doubletap(function(){ scope.apiProvider.actionTake(card) });
             }
             scope.deck.length() < 15 ? 
@@ -232,8 +233,13 @@ function PostLoad()
 
     scope.apiProvider.on("okey_enable", function(x) {
         var e = {detail: x.detail.json, raw: x.detail.bert};
+        var player = dec(e.raw).value[0][3][0].value[0][1].value;
         var enabled = dec(e.raw).value[0][3][1].value[0][1].value;
-        if (enabled) $("#Okey").show(); else $("#Okey").hide();
+        if (enabled) $("#Okey").show(); else {
+            $("#Okey").hide();
+            var cards = scope.playersLeftHandsMap[scope.user].cards;
+            if (cards.length) cards[cards.length-1].dragHandler.disable();
+        }
     });
 
     scope.apiProvider.on("okey_round_ended", function(x) {