X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=5b8b92206c7d202f21d0a9df01d8609b5c404b3b;hp=cc3f6fd7d7a51fd5053f6c7483edf0a07c8b1609;hb=cfc1cf0d2dde4d7f69f107d8c7ec30c815812da0;hpb=d2af3400944331ffd0c770f83857257c2f48e487 diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue index cc3f6fd7..5b8b9220 100644 --- a/client/src/components/Board.vue +++ b/client/src/components/Board.vue @@ -31,6 +31,7 @@ export default { circles: {}, //object of squares' ID --> true (TODO: use a set?) click: "", clickTime: 0, + initialized: 0, settings: store.state.settings }; }, @@ -194,7 +195,9 @@ export default { showCheck && lightSquare && incheckSq[ci][cj], "incheck-dark": showCheck && !lightSquare && incheckSq[ci][cj], - "hover-highlight": this.vr.hoverHighlight(ci, cj) + "hover-highlight": + this.vr.hoverHighlight( + [ci, cj], !this.analyze ? this.userColor : null) }, attrs: { id: getSquareId({ x: ci, y: cj }) @@ -297,7 +300,8 @@ export default { (!myReserveTop && !!this.vr.reserve[playingColor]) ); // Center reserves, assuming same number of pieces for each side: - const nbReservePieces = myReservePiecesArray.length; + const nbReservePieces = + Math.max(myReservePiecesArray.length, oppReservePiecesArray.length); const marginLeft = ((100 - nbReservePieces * (100 / reserveSquareNb)) / 2) + "%"; if (hasReserveTop) { @@ -365,7 +369,7 @@ export default { const squareWidth = boardElt.offsetWidth / sizeY; const offset = [boardElt.offsetTop, boardElt.offsetLeft]; const maxNbeltsPerRow = Math.min(this.choices.length, sizeY); - let topOffset = offset[0] + (sizeY / 2) * squareWidth - squareWidth / 2; + let topOffset = offset[0] + ((sizeX - 1) / 2) * squareWidth; let choicesHeight = squareWidth; if (this.choices.length >= sizeY) { // A second row is required (Eightpieces variant) @@ -460,6 +464,8 @@ export default { } }; } + if (this.initialized == 1) this.$emit("rendered"); + if (this.initialized <= 1) this.initialized++; return ( h( "div", @@ -544,15 +550,20 @@ export default { } }, addArrow: function(arrow) { - this.arrows.push(arrow); - // Also add to DOM: - const boardElt = document.getElementById("gamePosition"); - const squareWidth = boardElt.offsetWidth / V.size.y; - const bPos = boardElt.getBoundingClientRect(); - const newArrow = - this.getSvgArrow(arrow, bPos.top, bPos.left, squareWidth); - document.getElementById("arrowCanvas") - .insertAdjacentElement("beforeend", newArrow); + const arrowIdx = this.arrows.findIndex(a => { + return ( + a.start[0] == arrow.start[0] && a.start[1] == arrow.start[1] && + a.end[0] == arrow.end[0] && a.end[1] == arrow.end[1] + ); + }); + if (arrowIdx >= 0) + // Erase the arrow + this.arrows.splice(arrowIdx, 1); + else + // Add to arrows vector: + this.arrows.push(arrow); + // NOTE: no need to draw here, will be re-draw + // by updated() hook callong re_setDrawings() }, getSvgArrow: function(arrow, top, left, squareWidth) { const aStart = @@ -575,11 +586,12 @@ export default { return path; }, re_setDrawings: function() { + // Add some drawing on board (for some variants + arrows and circles) + const boardElt = document.getElementById("gamePosition"); + if (!boardElt) return; // Remove current canvas, if any const curCanvas = document.getElementById("arrowCanvas"); if (!!curCanvas) curCanvas.parentNode.removeChild(curCanvas); - // Add some drawing on board (for some variants + arrows and circles) - const boardElt = document.getElementById("gamePosition"); const squareWidth = boardElt.offsetWidth / V.size.y; const bPos = boardElt.getBoundingClientRect(); let svgArrows = []; @@ -639,7 +651,6 @@ export default { document.getElementById("rootBoardElement").appendChild(arrowCanvas); }, mousedown: function(e) { - e.preventDefault(); if (!this.mobileBrowser && e.which != 3) // Cancel current drawing and circles, if any this.cancelResetArrows(); @@ -650,6 +661,7 @@ export default { document.getElementById("boardContainer").getBoundingClientRect(); // NOTE: classList[0] is enough: 'piece' is the first assigned class const withPiece = (e.target.classList[0] == "piece"); + if (withPiece) e.preventDefault(); // Show possible moves if current player allowed to play const startSquare = getSquareFromId(withPiece ? e.target.parentNode.id : e.target.id); @@ -663,27 +675,29 @@ export default { this.$emit("click-square", sq); if (withPiece && !this.vr.onlyClick(sq)) { this.possibleMoves = this.vr.getPossibleMovesFrom(startSquare); - // For potential drag'n drop, remember start coordinates - // (to center the piece on mouse cursor) - let parent = e.target.parentNode; //surrounding square - const rect = parent.getBoundingClientRect(); - this.start = { - x: rect.x + rect.width / 2, - y: rect.y + rect.width / 2, - id: parent.id - }; - // Add the moving piece to the board, just after current image - this.selectedPiece = e.target.cloneNode(); - Object.assign( - this.selectedPiece.style, - { - position: "absolute", - top: 0, - display: "inline-block", - zIndex: 3000 - } - ); - parent.insertBefore(this.selectedPiece, e.target.nextSibling); + if (this.possibleMoves.length > 0) { + // For potential drag'n drop, remember start coordinates + // (to center the piece on mouse cursor) + let parent = e.target.parentNode; //surrounding square + const rect = parent.getBoundingClientRect(); + this.start = { + x: rect.x + rect.width / 2, + y: rect.y + rect.width / 2, + id: parent.id + }; + // Add the moving piece to the board, just after current image + this.selectedPiece = e.target.cloneNode(); + Object.assign( + this.selectedPiece.style, + { + position: "absolute", + top: 0, + display: "inline-block", + zIndex: 3000 + } + ); + parent.insertBefore(this.selectedPiece, e.target.nextSibling); + } } } } @@ -691,6 +705,7 @@ export default { } else if (e.which == 3) { // Mouse right button + e.preventDefault(); this.containerPos = document.getElementById("gamePosition").getBoundingClientRect(); let elem = e.target; @@ -698,6 +713,7 @@ export default { while (elem.tagName == "IMG") elem = elem.parentNode; this.startArrow = getSquareFromId(elem.id); } + else e.preventDefault(); }, mousemove: function(e) { if (!this.selectedPiece && !this.startArrow) return; @@ -758,15 +774,17 @@ export default { } }, mouseup: function(e) { - e.preventDefault(); if (this.mobileBrowser || e.which == 1) { if (!this.selectedPiece) return; + e.preventDefault(); // Drag'n drop. Selected piece is no longer needed: this.selectedPiece.parentNode.removeChild(this.selectedPiece); delete this.selectedPiece; this.selectedPiece = null; this.processMoveAttempt(e); - } else if (e.which == 3) { + } + else if (e.which == 3) { + e.preventDefault(); if (!this.startArrow) return; // Mouse right button this.movingArrow = null;