Bugfix winning tile selection on touch device

EmeraldCoder · Jan 28, 2014 · 3dece5d · 3dece5d
1 parent 6931f37
commit 3dece5d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/gui/Popup.js b/src/gui/Popup.js
@@ -3,13 +3,16 @@ var Popup = (function($){
     var $idleBackground,
         $popup,
         $popupTitle,
-        $popupButtons;
+        $popupButtons,
+        isOpen = false;
 
     function init() {
         createHtmlStructure();
     }
 
     function open(message, buttons) {
+        isOpen = true;
+
         $popupTitle.html(message);
 
         buttons.forEach(function(button){
@@ -27,6 +30,8 @@ var Popup = (function($){
     }
 
     function close() {
+        isOpen = false;
+
         $idleBackground.hide();
         $popup.hide();
 
@@ -57,6 +62,7 @@ var Popup = (function($){
     init();
     return {
         open: open,
-        close: close
+        close: close,
+        isOpen: isOpen
     };
 }(jQuery));
diff --git a/src/gui/RiichiMahjongPointerViewModel.js b/src/gui/RiichiMahjongPointerViewModel.js
@@ -191,6 +191,11 @@ function RiichiMahjongPointerViewModel() {
     };
 
     self.remove = function(index, isOpen) {
+        if (self.winningTile) {
+            self.winningTile.isWinningTile(false);
+            self.winningTile = null;
+        }
+
         if (isOpen) {
             self.openCombinaisons.splice(index, 1);
         } else {

diff --git a/src/gui/TouchCombinaisonDeletion.js b/src/gui/TouchCombinaisonDeletion.js
@@ -14,6 +14,8 @@
 
     $('.box-combinaison').on('touchend', 'span', function(e) {
         e.preventDefault();
+        $(this).trigger('click');
+
         if (selectionTimeout) clearTimeout(selectionTimeout);
     });