X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fbook.js;h=611678f8f99c52a3e73ea53241e31b88766dd24c;hb=4c5819ccf6f88f4ad0ed870921f8d972a46be8a0;hp=796b04ed8b8d7e3caa5fed7433b0cf1430e7d135;hpb=5f62f406da8dcbf111720bd528b7d71c053d9e95;p=remoteglot-book

diff --git a/www/js/book.js b/www/js/book.js
index 796b04e..611678f 100644
--- a/www/js/book.js
+++ b/www/js/book.js
@@ -1,18 +1,46 @@
 (function() {
 
 var board = null;
-var moves = [];
+var history = [];
 var move_override = 0;
 
+var entity_map = {
+	"&": "&",
+	"<": "&lt;",
+	">": "&gt;",
+	'"': '&quot;',
+	"'": '&#39;',
+};
+
+function escape_html(string) {
+	return String(string).replace(/[&<>"']/g, function (s) {
+		return entity_map[s];
+	});
+}
+
 var get_game = function() {
 	var game = new Chess();
 	for (var i = 0; i < move_override; ++i) {
-		game.move(moves[i]);
+		game.move(history[i]);
 	}
 	return game;
 }
 
 var update = function() {
+	var text = "";
+	for (var i = 0; i < history.length; ++i) {
+		if (i % 2 == 0) {
+			text += (i/2 + 1) + ". ";
+		}
+		if (i == move_override) {
+			text += '<strong>' + history[i] + '</strong>';
+		} else {
+			text += history[i];
+		}
+		text += " ";
+	}
+	$('#gamehistory').html(text);
+
 	var game = get_game();
 	board.position(game.fen());
 	fetch_analysis();
@@ -61,12 +89,33 @@ var direction = 1;
 var show_lines = function(data, game) {
 	var moves = data['moves'];
 	$('#numviewers').text(data['opening']);
+
+	if (data['root_game']) {
+		var text = escape_html(data['root_game']['white']);
+		if (data['root_game']['white_elo']) {
+			text += " (" + escape_html(data['root_game']['white_elo']) + ")";
+		}
+		text += " &ndash; " + escape_html(data['root_game']['black']);
+		if (data['root_game']['black_elo']) {
+			text += " (" + escape_html(data['root_game']['black_elo']) + ")";
+		}
+		text += " &nbsp;" + escape_html(data['root_game']['result']).replace(/-/, "&ndash;") + "<br />";
+		if (data['root_game']['eco']) {
+			text += "[" + escape_html(data['root_game']['eco']) + "] ";
+		}
+		text += "(" + data['root_game']['moves'] + ") ";
+		text += escape_html(data['root_game']['event']) + " &nbsp;" + escape_html(data['root_game']['date']);
+		$('#gamesummary').html(text);
+	}
+
 	var total_num = 0;
 	for (var i = 0; i < moves.length; ++i) {
 		var move = moves[i];
-		total_num += parseInt(move['white']);
-		total_num += parseInt(move['draw']);
-		total_num += parseInt(move['black']);
+		if (move['move']) {
+			total_num += parseInt(move['white']);
+			total_num += parseInt(move['draw']);
+			total_num += parseInt(move['black']);
+		}
 	}
 
 	var headings_tr = $("#headings");
@@ -144,6 +193,10 @@ var show_lines = function(data, game) {
 		var line = lines[i];
 		var tr = document.createElement("tr");
 
+		if (line[0] === undefined) {
+			$(tr).addClass("totals");
+		}
+
 		for (var j = 0; j < line.length; ++j) {
 			if (line[j] === null) {
 				add_td(tr, "");
@@ -151,6 +204,14 @@ var show_lines = function(data, game) {
 				var td = document.createElement("td");
 				tr.appendChild(td);
 				$(td).addClass("move");
+				if (line[j] !== undefined) {
+					if (move_override % 2 == 0) {
+						$(td).text(((move_override / 2) + 1) + ". ");
+					} else {
+						$(td).text(((move_override / 2) + 0.5) + ". …");
+					}
+				}
+
 				var move_a = document.createElement("a");
 				move_a.href = "javascript:make_move('" + line[j] + "')";
 				td.appendChild(move_a);
@@ -169,9 +230,14 @@ var show_lines = function(data, game) {
 }
 
 var make_move = function(move) {
-	moves.length = move_override;
-	moves.push(move);
-	move_override = moves.length;
+	if (move_override < history.length && history[move_override] == move) {
+		// User effectively only moved forward in history.
+		++move_override;
+	} else {
+		history.length = move_override;
+		history.push(move);
+		move_override = history.length;
+	}
 	update();
 }
 window['make_move'] = make_move;
@@ -185,7 +251,7 @@ var prev_move = function() {
 window['prev_move'] = prev_move;
 
 var next_move = function() {
-	if (move_override < moves.length) {
+	if (move_override < history.length) {
 		++move_override;
 		update();
 	}
@@ -214,8 +280,13 @@ var onDrop = function(source, target) {
 	// illegal move
 	if (move === null) return 'snapback';
 
-	moves = game.history({ verbose: true });
-	move_override = moves.length;
+	var new_history = game.history({ verbose: true });
+	history = [];
+	for (var i = 0; i < new_history.length; ++i) {
+		history.push(new_history[i].san);
+	}
+	move_override = history.length;
+	update();
 };
 
 // update the board position after the piece snap