X-Git-Url: https://git.auder.net/assets/icon_infos.svg?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=ef6ef01e17f3b5d20870301e4d680a2b163dba71;hb=ae2c49bb0bbaac3953f63be5b720e9c6835f00b6;hp=45364053e944d23d82daeb5b1e9a018227d6708b;hpb=9ddaf8da8743c50b9019888a82d84392913c60c9;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 45364053..ef6ef01e 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,18 +1,18 @@
 <template lang="pug">
 div#baseGame(tabindex=-1 @click="focusBg()"
-    @keydown="handleKeys" @wheel="handleScroll")
+    @keydown="handleKeys($event)" @wheel="handleScroll($event)")
   input#modalEog.modal(type="checkbox")
-  div#eogDiv(role="dialog" data-checkbox="modalEog" aria-labelledby="eogMessage")
-    .card.smallpad.small-modal.text-center
+  div#eogDiv(role="dialog" data-checkbox="modalEog")
+    .card.text-center
       label.modal-close(for="modalEog")
-      h3#eogMessage.section {{ endgameMessage }}
+      h3.section {{ endgameMessage }}
   input#modalAdjust.modal(type="checkbox")
-  div#adjuster(role="dialog" data-checkbox="modalAdjust" aria-labelledby="labelAdjust")
-    .card.smallpad.small-modal.text-center
+  div#adjuster(role="dialog" data-checkbox="modalAdjust")
+    .card.text-center
       label.modal-close(for="modalAdjust")
-      label#labelAdjust(for="boardSize") {{ st.tr["Board size"] }}
+      label(for="boardSize") {{ st.tr["Board size"] }}
       input#boardSize.slider(type="range" min="0" max="100" value="50"
-        @input="adjustBoard")
+        @input="adjustBoard()")
   #gameContainer
     #boardContainer
       Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
@@ -26,7 +26,7 @@ div#baseGame(tabindex=-1 @click="focusBg()"
         button(@click="flip()") &#8645;
         button(@click="play()") >
         button(@click="gotoEnd()") >>
-      #pgnDiv
+      #belowControls
         #downloadDiv(v-if="game.vname!='Dark' || game.score!='*'")
           a#download(href="#")
           button(@click="download()") {{ st.tr["Download"] }} PGN
@@ -84,6 +84,11 @@ export default {
       if (!!newMove) //if stop + launch new game, get undefined move
         this.play(newMove, "receive");
     },
+    // ...Or to undo (corr game, move not validated)
+    "game.moveToUndo": function(move) {
+      if (!!move)
+        this.undo(move);
+    },
   },
   computed: {
     showMoves: function() {
@@ -116,15 +121,14 @@ export default {
     if (!boardSize)
     {
       boardSize = (window.innerWidth >= 768
-        ? Math.min(600, 0.5*window.innerWidth) //heuristic...
+        ? 0.75 * Math.min(window.innerWidth, window.innerHeight)
         : window.innerWidth);
     }
     const movesWidth = (window.innerWidth >= 768 ? 280 : 0);
     document.getElementById("boardContainer").style.width = boardSize + "px";
     let gameContainer = document.getElementById("gameContainer");
     gameContainer.style.width = (boardSize + movesWidth) + "px";
-    // TODO: find the right formula here:
-    //document.getElementById("boardSize").value = Math.floor(boardSize / 10);
+    document.getElementById("boardSize").value = (boardSize * 100) / (window.innerWidth - movesWidth);
     // timeout to avoid calling too many time the adjust method
     let timeoutLaunched = false;
     window.addEventListener("resize", (e) => {
@@ -212,8 +216,8 @@ export default {
         vr_tmp.play(move);
         move.fen = vr_tmp.getFen();
       });
-      if (this.game.fenStart.indexOf(" b ") >= 0 ||
-        (this.moves.length > 0 && this.moves[0].color == "b"))
+      if ((this.moves.length > 0 && this.moves[0].color == "b") ||
+        (this.moves.length == 0 && this.vr_tmp.turn == "b"))
       {
         // 'end' is required for Board component to check lastMove for e.p.
         this.moves.unshift({color: "w", notation: "...", end: {x:-1,y:-1}});
@@ -221,7 +225,7 @@ export default {
       const L = this.moves.length;
       this.cursor = L-1;
       this.lastMove = (L > 0 ? this.moves[L-1]  : null);
-      this.incheck = [];
+      this.incheck = this.vr.getCheckSquares(this.vr.turn);
     },
     analyzePosition: function() {
       const newUrl = "/analyse/" + this.game.vname +
@@ -411,6 +415,11 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+[type="checkbox"]#modalEog+div .card
+  min-height: 45px
+[type="checkbox"]#modalAdjust+div .card
+  padding: 5px
+
 #baseGame
   width: 100%
   &:focus
@@ -423,25 +432,25 @@ export default {
 #downloadDiv
   display: inline-block
 
-#modal-eog+div .card
-  overflow: hidden
 #controls
-  margin-top: 10px
-  margin-left: auto
-  margin-right: auto
+  margin: 0 auto
   button
     display: inline-block
     width: 20%
     margin: 0
-@media screen and (min-width: 768px)
-  #controls
-    max-width: 400px
 #turnIndicator
   text-align: center
-#pgnDiv
+#belowControls
+  border-top: 1px solid #2f4f4f
   text-align: center
-  margin-left: auto
-  margin-right: auto
+  margin: 0 auto
+  & > #downloadDiv
+    margin: 0
+    & > button
+      margin: 0
+  & > button
+    border-left: 1px solid #2f4f4f
+    margin: 0
 #boardContainer
   float: left
 // TODO: later, maybe, allow movesList of variable width