deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

promotion dialog typing

pull/6882/head
Niklas Fiekas 2020-06-26 15:36:00 +02:00
parent 772c457b2a
commit dc751bdfc3
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/analyse/src/promotion.ts
View File

@ -4,7 +4,7 @@ import { bind, onInsert } from './util';
import * as util from 'chessground/util';
import { Role } from 'chessground/types';
import AnalyseCtrl from './ctrl';
import { JustCaptured } from './interfaces';
import { MaybeVNode, JustCaptured } from './interfaces';
interface Promoting {
orig: Key;
@ -35,7 +35,7 @@ export function start(ctrl: AnalyseCtrl, orig: Key, dest: Key, capture: JustCapt
return false;
}
function finish(ctrl: AnalyseCtrl, role: Role) {
function finish(ctrl: AnalyseCtrl, role: Role): void {
if (promoting) {
ground.promote(ctrl.chessground, promoting.dest, role);
if (promoting.callback) promoting.callback(promoting.orig, promoting.dest, promoting.capture, role);
@ -43,7 +43,7 @@ function finish(ctrl: AnalyseCtrl, role: Role) {
promoting = undefined;
}
export function cancel(ctrl: AnalyseCtrl) {
export function cancel(ctrl: AnalyseCtrl): void {
if (promoting) {
promoting = undefined;
ctrl.chessground.set(ctrl.cgConfig);
@ -51,7 +51,7 @@ export function cancel(ctrl: AnalyseCtrl) {
}
}
function renderPromotion(ctrl: AnalyseCtrl, dest: Key, pieces: string[], color: Color, orientation: Color) {
function renderPromotion(ctrl: AnalyseCtrl, dest: Key, pieces: string[], color: Color, orientation: Color): MaybeVNode {
if (!promoting) return;
let left = (7 - util.key2pos(dest)[0]) * 12.5;
@ -68,19 +68,19 @@ function renderPromotion(ctrl: AnalyseCtrl, dest: Key, pieces: string[], color:
const top = (color === orientation ? i : 7 - i) * 12.5;
return h('square', {
attrs: {
style: 'top:' + top + '%;left:' + left + '%'
style: `top:${top}%;left:${left}%`
},
hook: bind('click', e => {
e.stopPropagation();
finish(ctrl, serverRole);
})
}, [h('piece.' + serverRole + '.' + color)]);
}, [h(`piece.${serverRole}.${color}`)]);
}));
}
const roles: Role[] = ['queen', 'knight', 'rook', 'bishop'];
export function view(ctrl: AnalyseCtrl) {
export function view(ctrl: AnalyseCtrl): MaybeVNode {
if (!promoting) return;
return renderPromotion(ctrl, promoting.dest,

15
ui/round/src/promotion.ts
View File

@ -7,6 +7,7 @@ import { key2pos } from 'chessground/util';
import { bind } from './util';
import RoundController from './ctrl';
import { onInsert } from './util';
import { MaybeVNode } from './interfaces';
interface Promoting {
move: [cg.Key, cg.Key];
@ -87,7 +88,7 @@ export function cancel(ctrl: RoundController) {
promoting = undefined;
}
function renderPromotion(ctrl: RoundController, dest: cg.Key, roles: cg.Role[], color: Color, orientation: Color) {
function renderPromotion(ctrl: RoundController, dest: cg.Key, roles: cg.Role[], color: Color, orientation: Color): MaybeVNode {
var left = (7 - key2pos(dest)[0]) * 12.5;
if (orientation === 'white') left = 87.5 - left;
var vertical = color === orientation ? 'top' : 'bottom';
@ -103,24 +104,26 @@ function renderPromotion(ctrl: RoundController, dest: cg.Key, roles: cg.Role[],
}, roles.map((serverRole, i) => {
var top = (color === orientation ? i : 7 - i) * 12.5;
return h('square', {
attrs: {style: 'top: ' + top + '%;left: ' + left + '%'},
attrs: {
style: `top:${top}%;left:${left}%`
},
hook: bind('click', e => {
e.stopPropagation();
finish(ctrl, serverRole);
})
}, [
h('piece.' + serverRole + '.' + color)
h(`piece.${serverRole}.${color}`)
]);
}));
};
}
const roles: cg.Role[] = ['queen', 'knight', 'rook', 'bishop'];
export function view(ctrl: RoundController) {
export function view(ctrl: RoundController): MaybeVNode {
if (!promoting) return;
return renderPromotion(ctrl, promoting.move[1],
ctrl.data.game.variant.key === 'antichess' ? roles.concat('king') : roles,
ctrl.data.player.color,
ctrl.chessground.state.orientation);
};
}