From 5dd22cb7886a992ae949911632b153cba6b1a726 Mon Sep 17 00:00:00 2001 From: Julian Kuhlmann Date: Sun, 15 Mar 2015 11:29:15 +0100 Subject: [PATCH 1/2] Made the figure ordering consistent. --- js/chessboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/chessboard.js b/js/chessboard.js index 87c1d27c..0a0441fb 100644 --- a/js/chessboard.js +++ b/js/chessboard.js @@ -54,7 +54,7 @@ function validFen(fen) { for (var i = 0; i < 8; i++) { if (chunks[i] === '' || chunks[i].length > 8 || - chunks[i].search(/[^kqrbnpKQRNBP1-8]/) !== -1) { + chunks[i].search(/[^kqrnbpKQRNBP1-8]/) !== -1) { return false; } } @@ -527,7 +527,7 @@ function createElIds() { } // spare pieces - var pieces = 'KQRBNP'.split(''); + var pieces = 'KQRNBP'.split(''); for (var i = 0; i < pieces.length; i++) { var whitePiece = 'w' + pieces[i]; var blackPiece = 'b' + pieces[i]; From 0b1eaec062e76965fcef2f1a6349c85d1adad68c Mon Sep 17 00:00:00 2001 From: Julian Kuhlmann Date: Sun, 15 Mar 2015 13:50:11 +0100 Subject: [PATCH 2/2] Made the code prettier in a few places. --- js/chessboard.js | 49 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/js/chessboard.js b/js/chessboard.js index 0a0441fb..00dfc345 100644 --- a/js/chessboard.js +++ b/js/chessboard.js @@ -78,32 +78,33 @@ function validPositionObject(pos) { // convert FEN piece code to bP, wK, etc function fenToPieceCode(piece) { - // black piece - if (piece.toLowerCase() === piece) { + if (piece.toLowerCase() === piece) { // black piecce return 'b' + piece.toUpperCase(); + } + else if (piece.toUpperCase() === piece) { // white piece + return 'w' + piece.toUpperCase(); + } + else { + return false; } - - // white piece - return 'w' + piece.toUpperCase(); } // convert bP, wK, etc code to FEN structure function pieceCodeToFen(piece) { - var tmp = piece.split(''); + var pieceCodeLetters = piece.split(''); // white piece - if (tmp[0] === 'w') { - return tmp[1].toUpperCase(); + if (pieceCodeLetters[0] === 'w') { + return pieceCodeLetters[1].toUpperCase(); } // black piece - return tmp[1].toLowerCase(); + return pieceCodeLetters[1].toLowerCase(); } // convert FEN string to position object -// returns false if the FEN string is invalid function fenToObj(fen) { - if (validFen(fen) !== true) { + if (!validFen(fen)) { return false; } @@ -143,7 +144,7 @@ function fenToObj(fen) { // position object to FEN string // returns false if the obj is not a valid position object function objToFen(obj) { - if (validPositionObject(obj) !== true) { + if (!validPositionObject(obj)) { return false; } @@ -155,7 +156,7 @@ function objToFen(obj) { var square = COLUMNS[j] + currentRow; // piece exists - if (obj.hasOwnProperty(square) === true) { + if (obj.hasOwnProperty(square)) { fen += pieceCodeToFen(obj[square]); } @@ -560,22 +561,6 @@ function buildBoardContainer() { return html; } -/* -var buildSquare = function(color, size, id) { - var html = '
'; - - if (cfg.showNotation === true) { - - } - - html += '
'; - - return html; -}; -*/ - function buildBoard(orientation) { if (orientation !== 'black') { orientation = 'white'; @@ -865,12 +850,12 @@ function createRadius(square) { }); // just return the square code - var squares2 = []; + var surroundingSquares = []; for (var i = 0; i < squares.length; i++) { - squares2.push(squares[i].square); + surroundingSquares.push(squares[i].square); } - return squares2; + return surroundingSquares; } // returns the square of the closest instance of piece