Browse Source

dblclick take 2

Maxim Sokhatsky 11 years ago
parent
commit
569eac8687
2 changed files with 20 additions and 21 deletions
  1. 17 18
      apps/web/priv/static/app/index.htm
  2. 3 3
      apps/web/priv/static/app/js/okey/okey.js

+ 17 - 18
apps/web/priv/static/app/index.htm

@@ -13,27 +13,26 @@
 
     <svg id="Refined" style="top:0; left:0; height:100%; width:100%;"></svg>
 
-    <script src="js/n2o/bert.js?v=5"></script>
-    <script src="js/n2o/bullet.js?v=5"></script>
-    <script src="js/n2o/facebook.js?v=5"></script>
+    <script src="js/n2o/bert.js?v=6"></script>
+    <script src="js/n2o/bullet.js?v=6"></script>
+    <script src="js/n2o/facebook.js?v=6"></script>
 
-    <script src="js/selector.js?v=5"></script>
-    <script src="js/controller.js?v=5"></script>
-    <script src="js/dragndrop.js?v=5"></script>
-    <script src="js/timer.js?v=5"></script>
-    <script src="js/player.js?v=5"></script>
-    <script src="js/chat.js?v=5"></script>
-    <script src="js/roster.js?v=5"></script>
-    <script src="js/translations.js?v=5"></script>
+    <script src="js/selector.js?v=6"></script>
+    <script src="js/controller.js?v=6"></script>
+    <script src="js/dragndrop.js?v=6"></script>
+    <script src="js/timer.js?v=6"></script>
+    <script src="js/player.js?v=6"></script>
+    <script src="js/chat.js?v=6"></script>
+    <script src="js/roster.js?v=6"></script>
+    <script src="js/translations.js?v=6"></script>
 
-    <script src="js/okey/okey_protocol.js?v=5"></script>
-    <script src="js/okey/hand.js?v=5"></script>
-    <script src="js/okey/card.js?v=5"></script>
-    <script src="js/okey/deck.js?v=5"></script>
-    <script src="js/okey/okey.js?v=5"></script>
+    <script src="js/okey/okey_protocol.js?v=6"></script>
+    <script src="js/okey/hand.js?v=6"></script>
+    <script src="js/okey/card.js?v=6"></script>
+    <script src="js/okey/deck.js?v=6"></script>
+    <script src="js/okey/okey.js?v=6"></script>
 
-    <script src="js/bootloader.js?v=5
-    "></script>
+    <script src="js/bootloader.js?v=6"></script>
 
 </body>
 </html>

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

@@ -31,7 +31,6 @@ function PostLoad()
     function addFadeOut()    { $(this).on (document.createTouch ? "touchend" : "mouseup", fadeOut); }
     function removeFadeOut() { $(this).off(document.createTouch ? "touchend" : "mouseup", fadeOut); }
     function pileClick() {
-        scope.centralCard.$el.off("dblclick", pileClick);
         scope.apiProvider.actionTake(scope.centralCard);
     }
 
@@ -63,8 +62,9 @@ function PostLoad()
             scope.apiProvider.actionDiscard(e.detail.card) }),
 
         scope.centralCard.off("dragmove", removeFadeOut)
-                   .off("dragstop", addFadeOut)
-                   .off("revert", fadeOut),
+                         .off("dragstop", addFadeOut)
+                         .off("revert", fadeOut)
+                         .off("dblclick", pileClick),
 
         ~scope.playersLeftHandsMap[scope.user].cards.indexOf(e.detail.card) &&
         scope.playersLeftHandsMap[scope.user].pop(),