Code simplification + a few fixes

[vchess.git] / public / javascripts / components / rules.js

diff --git a/public/javascripts/components/rules.js b/public/javascripts/components/rules.js
index fd05d44..c3107a6 100644 (file)
--- a/public/javascripts/components/rules.js
+++ b/public/javascripts/components/rules.js
@@ -21,7 +21,7 @@ Vue.component('my-rules', {
        },
        methods: {
                drawDiag: function(fen) {
-                       let [sizeX,sizeY] = VariantRules.size;
+                       let [sizeX,sizeY] = [V.size.x,V.size.y];
                        let fenParts = fen.split(" ");
                        // Obtain array of pieces images names
                        let board = VariantRules.GetBoard(fenParts[0]);
@@ -54,13 +54,13 @@ Vue.component('my-rules', {
                                {
                                        boardDiv += "<div class='board board" + sizeY + " " +
                                                ((i+j)%2==0 ? "light-square-diag" : "dark-square-diag") + "'>";
-                                       if (markArray.length>0 && markArray[i][j])
-                                               boardDiv += "<img src='/images/mark.svg' class='markSquare'/>";
                                        if (board[i][j] != VariantRules.EMPTY)
                                        {
                                                boardDiv += "<img src='/images/pieces/" +
                                                        VariantRules.getPpath(board[i][j]) + ".svg' class='piece'/>";
                                        }
+                                       if (markArray.length>0 && markArray[i][j])
+                                               boardDiv += "<img src='/images/mark.svg' class='mark-square'/>";
                                        boardDiv += "</div>";
                                }
                                boardDiv += "</div>";