Skip to content

[Added] Spare piece counts functionality #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sanjaynishad wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[Added] Spare piece counts functionality #128

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5c3282
[Added] Spare piece counts functionality
sanjaynishad Jul 14, 2016
0c2242a
[Updated] Remove spare pieces on 0 count
sanjaynishad Jul 21, 2016
1cab571
[Fixed] spare count undefined
sanjaynishad Jul 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 68 additions & 9 deletions www/js/chessboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ var ANIMATION_HAPPENING = false,
DRAGGED_PIECE_SOURCE,
DRAGGING_A_PIECE = false,
SPARE_PIECE_ELS_IDS = {},
SPARE_COUNT_ELS_IDS = {},
SQUARE_ELS_IDS = {},
SQUARE_ELS_OFFSETS;

Expand Down Expand Up @@ -399,6 +400,19 @@ function validAnimationSpeed(speed) {
return (speed >= 0);
}

function validSpareCounts(counts) {
if (typeof counts !== 'object' || Object.getOwnPropertyNames(counts).length === 0) {
return false;
}

for (var i in counts) {
if (isNaN(counts[i])) {
return false;
}
}
return true;
}

// validate config / set default options
function expandConfig() {
if (typeof cfg === 'string' || validPositionObject(cfg) === true) {
Expand Down Expand Up @@ -485,6 +499,28 @@ function expandConfig() {
error(7263, 'Invalid value passed to config.position.', cfg.position);
}
}

//spare piece counts
if (cfg.sparePieces && cfg.hasOwnProperty('spareCounts') === true) {
if (cfg.spareCounts === 'default') {
cfg.spareCounts = {
'wK': 1,
'wQ': 1,
'wR': 2,
'wB': 2,
'wN': 2,
'wP': 8,
'bK': 1,
'bQ': 1,
'bR': 2,
'bB': 2,
'bN': 2,
'bP': 8
}
} else if (!validSpareCounts(cfg.spareCounts)) {
cfg.spareCounts = false;
}
}

return true;
}
Expand Down Expand Up @@ -533,6 +569,8 @@ function createElIds() {
var blackPiece = 'b' + pieces[i];
SPARE_PIECE_ELS_IDS[whitePiece] = whitePiece + '-' + uuid();
SPARE_PIECE_ELS_IDS[blackPiece] = blackPiece + '-' + uuid();
SPARE_COUNT_ELS_IDS[whitePiece] = whitePiece + '-' + uuid();
SPARE_COUNT_ELS_IDS[blackPiece] = blackPiece + '-' + uuid();
}
}

Expand All @@ -544,15 +582,15 @@ function buildBoardContainer() {
var html = '<div class="' + CSS.chessboard + '">';

if (cfg.sparePieces === true) {
html += '<div class="' + CSS.sparePieces + ' ' +
CSS.sparePiecesTop + '"></div>';
html += '<div style="text-align:center;"><div style="display:inline-block;" class="' +
CSS.sparePieces + ' ' + CSS.sparePiecesTop + '"></div></div>';
}

html += '<div class="' + CSS.board + '"></div>';

if (cfg.sparePieces === true) {
html += '<div class="' + CSS.sparePieces + ' ' +
CSS.sparePiecesBottom + '"></div>';
html += '<div style="text-align:center;"><div style="display:inline-block;" class="' +
CSS.sparePieces + ' ' + CSS.sparePiecesBottom + '"></div></div>';
}

html += '</div>';
Expand Down Expand Up @@ -669,6 +707,13 @@ function buildPiece(piece, hidden, id) {
return html;
}

function spareCountHtml(piece) {
if(typeof cfg.spareCounts !== 'object' || cfg.spareCounts[piece] === 0) {
return "";
}
return '<span id="'+ SPARE_COUNT_ELS_IDS[piece] +'" style="font-weight:bold; position: absolute;bottom: -2px;right: -2px;">'+ cfg.spareCounts[piece] +'</span>';
}

function buildSparePieces(color) {
var pieces = ['wK', 'wQ', 'wR', 'wB', 'wN', 'wP'];
if (color === 'black') {
Expand All @@ -677,9 +722,12 @@ function buildSparePieces(color) {

var html = '';
for (var i = 0; i < pieces.length; i++) {
html += buildPiece(pieces[i], false, SPARE_PIECE_ELS_IDS[pieces[i]]);
if(typeof cfg.spareCounts === 'object' && cfg.spareCounts[pieces[i]] <= 0) {
continue;
}
html += '<div style="width: ' + SQUARE_SIZE + 'px;' +
'height: ' + SQUARE_SIZE + 'px;float:left;position:relative;">' + buildPiece(pieces[i], false, SPARE_PIECE_ELS_IDS[pieces[i]]) + spareCountHtml(pieces[i]) + '</div>';
}

return html;
}

Expand Down Expand Up @@ -1158,7 +1206,8 @@ function beginDraggingPiece(source, piece, x, y) {
// their custom onDragStart function can cancel drag start
if (typeof cfg.onDragStart === 'function' &&
cfg.onDragStart(source, piece,
deepCopy(CURRENT_POSITION), CURRENT_ORIENTATION) === false) {
deepCopy(CURRENT_POSITION), CURRENT_ORIENTATION) === false ||
(source === 'spare' && cfg.spareCounts && cfg.spareCounts[piece] <= 0)) {
return;
}

Expand Down Expand Up @@ -1287,6 +1336,14 @@ function stopDraggedPiece(location) {
else if (action === 'drop') {
dropDraggedPieceOnSquare(location);
}

if(cfg.spareCounts && DRAGGED_PIECE_SOURCE === 'spare' && action === 'drop'){
if(--cfg.spareCounts[DRAGGED_PIECE] <= 0){
$("#" + SPARE_COUNT_ELS_IDS[DRAGGED_PIECE]).parent().remove();
} else {
$("#" + SPARE_COUNT_ELS_IDS[DRAGGED_PIECE]).html(cfg.spareCounts[DRAGGED_PIECE]);
}
}
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1446,8 +1503,10 @@ widget.resize = function() {

// spare pieces
if (cfg.sparePieces === true) {
containerEl.find('.' + CSS.sparePieces)
.css('paddingLeft', (SQUARE_SIZE + BOARD_BORDER_SIZE) + 'px');
containerEl.find('.' + CSS.sparePieces)
.css('height', SQUARE_SIZE + 'px');
containerEl.find('.' + CSS.sparePieces)
.css('position', 'relative');
}

// redraw the board
Expand Down