deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

fix JS redirects

pull/7235/head
Thibault Duplessis 2020-09-05 22:01:27 +02:00
parent 25d41ad222
commit bde2683011
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/round/src/ctrl.ts
View File

@ -603,6 +603,7 @@ export default class RoundController {
setRedirecting = () => {
this.redirecting = true;
window.lichess.unload.expected = true;
setTimeout(() => {
this.redirecting = false;
this.redraw();

1
ui/round/src/moveOn.ts
View File

@ -17,7 +17,6 @@ export default class MoveOn {
private redirect = (href: string) => {
this.ctrl.setRedirecting();
window.lichess.unload.expected = true;
window.location.href = href;
};

1
ui/round/src/socket.ts
View File

@ -140,7 +140,6 @@ export function make(send: SocketSend, ctrl: RoundController): RoundSocket {
!isPlayerTurn(ctrl.data)) {
ctrl.setRedirecting();
sound.move();
li.unload.expected = true;
location.href = '/' + gameId;
}
},

13
ui/site/src/site.ts
View File

@ -22,11 +22,12 @@ import OnlineFriends from "./component/friends";
import watchers from "./component/watchers";
exportLichessGlobals();
window.lichess.info = info;
const li = window.lichess;
li.info = info;
loadClockWidget();
window.lichess.load.then(() => {
li.load.then(() => {
moduleLaunchers();
@ -77,8 +78,8 @@ window.lichess.load.then(() => {
pubsub.on('content_loaded', timeago.findAndRender);
setTimeout(() => {
if (!window.lichess.socket)
window.lichess.socket = new StrongSocket("/socket/v5", false);
if (!li.socket)
li.socket = new StrongSocket("/socket/v5", false);
}, 300);
topBar();
@ -165,6 +166,10 @@ window.lichess.load.then(() => {
serviceWorker();
// socket default receive handlers
pubsub.on('socket.in.redirect', (d: RedirectTo) => {
li.unload.expected = true;
li.redirect(d);
});
pubsub.on('socket.in.fen', e =>
document.querySelectorAll('.mini-game-' + e.id).forEach((el: HTMLElement) => miniGame.update(el, e))
);