X-Git-Url: https://git.auder.net/assets/icon_infos.svg?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=a7acc10d164e128d9c446ff83ddea3f47fba6128;hb=9de73b71a1db5464f89a202e6cdfdc7b6b6b0753;hp=bd66f7310af01bd864487c55af260a9f74fb2d83;hpb=da2f044481b0eb4d041569149a457365940743aa;p=vchess.git

diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index bd66f731..a7acc10d 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -16,6 +16,7 @@ Vue.component('my-game', {
 			seek: false,
 			fenStart: "",
 			incheck: [],
+			pgnTxt: "",
 			expert: document.cookie.length>0 ? document.cookie.substr(-1)=="1" : false,
 		};
 	},
@@ -216,18 +217,21 @@ Vue.component('my-game', {
 					);
 				}), choices]
 			);
-			actionArray.push(
-				h('button',
-					{
-						on: { click: this.resign },
-						attrs: { "aria-label": 'Resign' },
-						'class': {
-							"tooltip":true,
-							"bottom": true,
+			if (this.mode != "idle")
+			{
+				actionArray.push(
+					h('button',
+						{
+							on: { click: this.resign },
+							attrs: { "aria-label": 'Resign' },
+							'class': {
+								"tooltip":true,
+								"bottom": true,
+							},
 						},
-					},
-					[h('i', { 'class': { "material-icons": true } }, "flag")])
-			);
+						[h('i', { 'class': { "material-icons": true } }, "flag")])
+				);
+			}
 			elementArray.push(gameDiv);
 	//			if (!!vr.reserve)
 	//			{
@@ -349,7 +353,7 @@ Vue.component('my-game', {
 								attrs: { id: "pgn-game" },
 								on: { click: this.download },
 								domProps: {
-									innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode)
+									innerHTML: this.pgnTxt
 								}
 							}
 						)
@@ -408,7 +412,6 @@ Vue.component('my-game', {
 		};
 		const socketMessageListener = msg => {
 			const data = JSON.parse(msg.data);
-			console.log("Receive message: " + data.code);
 			switch (data.code)
 			{
 				case "newgame": //opponent found
@@ -493,12 +496,12 @@ Vue.component('my-game', {
 			this.score = score;
 			let modalBox = document.getElementById("modal-eog");
 			modalBox.checked = true;
-			setTimeout(() => {
-				modalBox.checked = false;
-				this.mode = "idle"; //TODO: not the best way... (to see correct opponent in PGN)
-			}, 2000);
+			// Variants may have special PGN structure (so next function isn't defined here)
+			this.pgnTxt = this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode);
+			setTimeout(() => { modalBox.checked = false; }, 2000);
 			if (this.mode == "human")
 				this.clearStorage();
+			this.mode = "idle";
 			this.oppid = "";
 		},
 		getEndgameMessage: function(score) {
@@ -571,6 +574,8 @@ Vue.component('my-game', {
 			this.newGame("computer");
 		},
 		newGame: function(mode, fenInit, color, oppId, moves, continuation) {
+			//const fen = "bbrkqnrn/pppppppp/8/8/8/8/PPPPPPPP/NNRKQBBR 1111";
+			//const fen = "bbrkqnr1/pppppp1p/6o1/6s1/3SS3/8/PPP2PPP/NNRKQBBR 1111"; //first 2 moves == pb
 			const fen = fenInit || VariantRules.GenRandInitFen();
 			console.log(fen); //DEBUG
 			this.score = "*";
@@ -600,6 +605,7 @@ Vue.component('my-game', {
 				return;
 			}
 			this.vr = new VariantRules(fen, moves || []);
+			this.pgnTxt = ""; //redundant with this.score = "*", but cleaner
 			this.mode = mode;
 			this.incheck = []; //in case of
 			this.fenStart = continuation
@@ -630,6 +636,7 @@ Vue.component('my-game', {
 			}
 			else //against computer
 			{
+				//this.mycolor = "w";
 				this.mycolor = Math.random() < 0.5 ? 'w' : 'b';
 				if (this.mycolor == 'b')
 					setTimeout(this.playComputerMove, 500);