deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

no longer move rematch button

Browse source
This commit is contained in:
Thibault Duplessis 2018-06-10 14:26:29 +02:00
parent 2af392a4bb
commit 265d5c7c1f
2 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
public/stylesheets/board.css
View file

@ -850,18 +850,6 @@ div.control .button.disabled {
text-transform: uppercase;
transition: height 0.5s ease;
}
.lichess_ground .rematch.button span {
transition: opacity 0.5s ease;
}
.lichess_ground .rematch.disabled {
height: 0;
overflow: hidden;
transition: height 0.5s ease;
}
.lichess_ground .rematch.disabled span {
opacity: 0;
transition: opacity 0.25s ease;
}
.variant_crazyhouse .lichess_ground .rematch.button {
height: 60px;
}
@ -884,7 +872,7 @@ div.control .button.disabled {
.lichess_ground .rematch.them span {
animation: rubberBand 5s infinite;
}
.lichess_ground .rematch.button:hover {
.lichess_ground .rematch.button:not(.disabled):hover {
background: rgba(56,147,232,0.8);
color: #fff!important;
animation: none;

44
ui/round/src/view/button.ts
View file

@ -40,12 +40,16 @@ function rematchButtons(ctrl: RoundController): MaybeVNodes {
})
}) : null,
h('a.button.rematch.white', {
class: { me, them },
class: {
me,
them,
disabled: !(d.opponent.onGame || (!d.clock && d.player.user && d.opponent.user))
},
attrs: {
title: them ? ctrl.trans.noarg('yourOpponentWantsToPlayANewGameWithYou') : (
me ? ctrl.trans.noarg('rematchOfferSent') : '')
},
hook: util.bind('click', () => {
hook: util.bind('click', e => {
const d = ctrl.data;
if (d.game.rematch) location.href = router.game(d.game.rematch, d.opponent.color);
else if (d.player.offeringRematch) {
@ -56,7 +60,7 @@ function rematchButtons(ctrl: RoundController): MaybeVNodes {
d.player.offeringRematch = true;
ctrl.socket.send('rematch-yes');
}
else ctrl.challengeRematch();
else if (!(e.target as HTMLElement).classList.contains('disabled')) ctrl.challengeRematch();
}, ctrl.redraw)
}, [
me ? util.spinner() : h('span', ctrl.trans.noarg('rematch'))
@ -242,28 +246,28 @@ export function moretime(ctrl: RoundController) {
export function followUp(ctrl: RoundController): VNode {
const d = ctrl.data,
rematchable = !d.game.rematch && (status.finished(d) || status.aborted(d)) && !d.tournament && !d.simul && !d.game.boosted && (d.opponent.onGame || (!d.clock && d.player.user && d.opponent.user)),
rematchable = !d.game.rematch && (status.finished(d) || status.aborted(d)) && !d.tournament && !d.simul && !d.game.boosted,
newable = (status.finished(d) || status.aborted(d)) && (
d.game.source === 'lobby' ||
d.game.source === 'pool'),
rematchZone = ctrl.challengeRematched ? [
h('div.suggestion.text', util.justIcon('j'), ctrl.trans.noarg('rematchOfferSent')
)] : (rematchable || d.game.rematch ? rematchButtons(ctrl) : [
h('a.button.rematch.white',
{ class: { disabled: true } },
[h('span', ctrl.trans.noarg('rematch'))]
)
]);
return h('div.follow_up', [
...rematchZone,
d.tournament ? h('a.button', {
attrs: {href: '/tournament/' + d.tournament.id}
}, ctrl.trans.noarg('viewTournament')) : null,
newable ? h('a.button', {
attrs: {href: d.game.source === 'pool' ? poolUrl(d.clock!, d.opponent.user) : '/?hook_like=' + d.game.id },
}, ctrl.trans.noarg('newOpponent')) : null,
analysisButton(ctrl)
]);
)] : (rematchable || d.game.rematch ? rematchButtons(ctrl) : [
h('a.button.rematch.white',
{ class: { disabled: true } },
[h('span', ctrl.trans.noarg('rematch'))]
)
]);
return h('div.follow_up', [
...rematchZone,
d.tournament ? h('a.button', {
attrs: {href: '/tournament/' + d.tournament.id}
}, ctrl.trans.noarg('viewTournament')) : null,
newable ? h('a.button', {
attrs: {href: d.game.source === 'pool' ? poolUrl(d.clock!, d.opponent.user) : '/?hook_like=' + d.game.id },
}, ctrl.trans.noarg('newOpponent')) : null,
analysisButton(ctrl)
]);
}
export function watcherFollowUp(ctrl: RoundController): VNode {