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

try to fix central card double tap issue

Maxim Sokhatsky 11 лет назад
Родитель
Сommit
4164ef0fba
2 измененных файлов с 23 добавлено и 18 удалено
  1. 18 17
      apps/web/priv/static/app/index.htm
  2. 5 1
      apps/web/priv/static/app/js/okey/okey.js

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

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

+ 5 - 1
apps/web/priv/static/app/js/okey/okey.js

@@ -30,6 +30,10 @@ function PostLoad()
     function fadeIn()        { $(this).animate({ attributeName: "opacity", from: 0, to: 1, dur: .3}); }
     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);
+    }
 
     function createCentralCard() {
         scope.centralCard = new scope.Card(),
@@ -43,7 +47,7 @@ function PostLoad()
             .on("dragmove", scope.deck.track)
             .on("revert",   fadeOut);
 
-        scope.centralCard.$el.doubletap(function() { scope.apiProvider.actionTake(scope.centralCard) });
+        scope.centralCard.$el.doubletap(pileClick);
         scope.deck.$el.append(scope.centralCard.$el[0]);
         scope.centralCard.drag();
         scope.centralCard.dragHandler.enable();