X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=72b5da9009252f03fa7a15842888827fa87c2519;hb=dda21a71b6245832a78ca987b14c77176bd15dd6;hp=f5bef8effdeae9f4340862e8c0783302a7ff8054;hpb=5c42c64e0b43ad4d687c58a6b7e9b9ac5d212e17;p=vchess.git

diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index f5bef8ef..72b5da90 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -242,13 +242,14 @@ Vue.component('my-game', {
 			elementArray.push(gameDiv);
 			if (!!this.vr.reserve)
 			{
+				const shiftIdx = (this.mycolor=="w" ? 0 : 1);
 				let myReservePiecesArray = [];
 				for (let i=0; i<VariantRules.RESERVE_PIECES.length; i++)
 				{
 					myReservePiecesArray.push(h('div',
 					{
 						'class': {'board':true, ['board'+sizeY]:true},
-						attrs: { id: this.getSquareId({x:sizeX,y:i}) }
+						attrs: { id: this.getSquareId({x:sizeX+shiftIdx,y:i}) }
 					},
 					[
 						h('img',
@@ -272,7 +273,7 @@ Vue.component('my-game', {
 					oppReservePiecesArray.push(h('div',
 					{
 						'class': {'board':true, ['board'+sizeY]:true},
-						attrs: { id: this.getSquareId({x:sizeX,y:i}) }
+						attrs: { id: this.getSquareId({x:sizeX+(1-shiftIdx),y:i}) }
 					},
 					[
 						h('img',
@@ -431,14 +432,14 @@ Vue.component('my-game', {
 					"col-lg-6":true,
 					"col-lg-offset-3":true,
 				},
-				// NOTE: click = mousedown + mouseup --> what about smartphone?!
+				// NOTE: click = mousedown + mouseup
 				on: {
 					mousedown: this.mousedown,
 					mousemove: this.mousemove,
 					mouseup: this.mouseup,
-					touchdown: this.mousedown,
-					touchmove: this.mousemove,
-					touchup: this.mouseup,
+//					touchstart: this.mousedown, //TODO...
+//					touchmove: this.mousemove,
+//					touchend: this.mouseup,
 				},
 			},
 			elementArray
@@ -735,6 +736,19 @@ Vue.component('my-game', {
 		},
 		mousedown: function(e) {
 			e = e || window.event;
+			let ingame = false;
+			let elem = e.target;
+			while (!ingame && elem !== null)
+			{
+				if (elem.classList.contains("game"))
+				{
+					ingame = true;
+					break;
+				}
+				elem = elem.parentElement;
+			}
+			if (!ingame) //let default behavior (click on button...)
+				return;
 			e.preventDefault(); //disable native drag & drop
 			if (!this.selectedPiece && e.target.classList.contains("piece"))
 			{
@@ -754,7 +768,8 @@ Vue.component('my-game', {
 				this.possibleMoves = this.mode!="idle" && this.vr.canIplay(this.mycolor,startSquare)
 					? this.vr.getPossibleMovesFrom(startSquare)
 					: [];
-				e.target.parentNode.appendChild(this.selectedPiece);
+				// Next line add moving piece just after current image (required for Crazyhouse reserve)
+				e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling);
 			}
 		},
 		mousemove: function(e) {