deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

improve challenge UI and anon support

pull/1283/head
Thibault Duplessis 2016-02-04 07:58:01 +07:00
parent 01630eb87b
commit bbdb5aad15
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/challenge/theirs.scala.html
View File

@ -15,19 +15,42 @@ moreJs = js(c, json, false)) {
@explanation(c)
@c.initialFen.map { fen =>
<br />
@views.html.game.miniBoard(fen, color = c.chessColor.name)
@views.html.game.miniBoard(fen, color = (!(c.chessColor)).name)
}
<br />
@c.status match {
case Status.Created | Status.Offline => {
@if(!c.mode.rated || ctx.isAuth) {
@if(c.mode.rated && c.unlimited) {
<div class="join_warning warning">@trans.bewareTheGameIsRatedButHasNoClock()</div>
}
<form style="margin-top: 20px" action="@routes.Challenge.accept(c.id)" method="post">
<form class="accept" action="@routes.Challenge.accept(c.id)" method="post">
<button name="submit" type="submit" class="submit text button" data-icon="G">@trans.joinTheGame()</button>
</form>
} else {
<hr />
<p class="error">This game is rated<br />You must <a href="@routes.Auth.login?referrer=@routes.Round.watcher(c.id, "white")">log in</a> to join it.</p>
}
}
case Status.Declined => {
<div class="declined">
<h2>Challenge declined</h2>
<a class="button" href="@routes.Lobby.home()">@trans.playWithAnotherOpponent()</a>
</div>
}
case Status.Accepted => {
<div class="accepted">
<h2>Challenge accepted!</h2>
<a id="challenge_redirect" href="@routes.Round.watcher(c.id, "white")" class="button">@trans.joinTheGame()</a>
</div>
}
case Status.Canceled => {
<div class="canceled">
<h2>Challenge canceled.</h2>
<a class="button" href="@routes.Lobby.home()">@trans.playWithAnotherOpponent()</a>
</div>
}
}
</div>
</div>
}

17
public/javascripts/challenge.js
View File

@ -1,7 +1,7 @@
lichess = lichess || {};
lichess.startChallenge = function(element, opts) {
console.log(opts);
var challenge = opts.data.challenge;
var accepting;
if (!opts.owner && lichess.openInMobileApp(challenge.id)) return;
lichess.socket = new lichess.StrongSocket(
opts.socketUrl,
@ -19,7 +19,8 @@ lichess.startChallenge = function(element, opts) {
url: opts.xhrUrl,
success(html) {
$('.lichess_overboard').replaceWith($(html).find('.lichess_overboard'));
$('#challenge_redirect').each(function() {
init();
if (!accepting) $('#challenge_redirect').each(function() {
location.href = $(this).attr('href');
});
}
@ -28,6 +29,14 @@ lichess.startChallenge = function(element, opts) {
}
});
var init = function() {
$('.lichess_overboard').find('form.accept').submit(function() {
accepting = true;
$(this).html('<div class="square-wrap"><div class="square-spin"></div></div>');
});
};
init();
var pingNow = function() {
if (document.getElementById('ping_challenge')) {
lichess.socket.send('ping');
@ -36,10 +45,10 @@ lichess.startChallenge = function(element, opts) {
};
pingNow();
Chessground(element.querySelector('.lichess_board'), {
var ground = Chessground(element.querySelector('.lichess_board'), {
viewOnly: true,
fen: challenge.initialFen,
orientation: challenge.color,
orientation: (opts.owner ^ challenge.color === 'black') ? 'white' : 'black',
coordinates: false,
disableContextMenu: true
});