Bug fix for open combinaison deletion

EmeraldCoder · Feb 15, 2014 · babd0eb · babd0eb
1 parent b5273d8
commit babd0eb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/index.html b/index.html
@@ -238,19 +238,19 @@ <h1 style="font-size: 30px; line-height: 40px;"><span data-bind="{text: title}">
     <script type="text/html" id="hand-template">
     <!-- ko foreach: tiles -->
         <!-- ko if: $index() === $parent.tiles.length-1 && !isWinningTile() -->
-        <span class="last" data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
+        <span class="last" data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index, 'data-combinaison-concealed': $parent._isConcealed}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
         <!-- /ko -->
         
         <!-- ko if: $index() === $parent.tiles.length-1 && isWinningTile() -->
-        <span class="waiting last" data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
+        <span class="waiting last" data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index, 'data-combinaison-concealed': $parent._isConcealed}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
         <!-- /ko -->
 
         <!-- ko if: $index() !== $parent.tiles.length-1 && isWinningTile() -->
-        <span class="waiting" data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
+        <span class="waiting" data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index, 'data-combinaison-concealed': $parent._isConcealed}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
         <!-- /ko -->
         
         <!-- ko if: $index() !== $parent.tiles.length-1 && !isWinningTile() -->
-        <span data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
+        <span data-bind="click: $root.setWinningTile, attr: {'data-combinaison-index': $parent._index, 'data-combinaison-concealed': $parent._isConcealed}"><img data-bind="attr: {src: 'img/' + suit + value + '.png'}" /></span>
         <!-- /ko -->
     <!-- /ko -->
     </script>

diff --git a/src/gui/DragDropCombinaisonDeletion.js b/src/gui/DragDropCombinaisonDeletion.js
@@ -13,7 +13,7 @@
             e.preventDefault();
 
             var index = parseInt(dragging.attr('data-combinaison-index')),
-                isOpen = dragging.parents('div').attr('id') === 'OpenCombinaison';
+                isOpen = dragging.attr('data-combinaison-concealed') !== 'true';
 
             viewModel.remove(index, isOpen);
 

diff --git a/src/gui/RiichiMahjongPointerViewModel.js b/src/gui/RiichiMahjongPointerViewModel.js
@@ -223,6 +223,7 @@ function RiichiMahjongPointerViewModel() {
                 combinaison.tiles[i].isWinningTile = ko.observable(false);
             }
 
+            combinaison._isConcealed = self.addIsConcealed;
             if (self.addIsConcealed) {
                 combinaison._index = ko.computed(function(){
                     return self.concealedCombinaisons.indexOf(this);

diff --git a/src/gui/TouchCombinaisonDeletion.js b/src/gui/TouchCombinaisonDeletion.js
@@ -29,9 +29,9 @@
         );
     }
 
-    function deleteSelectedCombinaison() {           
+    function deleteSelectedCombinaison() {
         var index = parseInt(selection.attr('data-combinaison-index')),
-            isOpen = selection.parents('div').attr('id') === 'OpenCombinaison';
+            isOpen = selection.attr('data-combinaison-concealed') !== 'true';
         viewModel.remove(index, isOpen);
     }