reload tournament data less often, unless you're joining

googed · Dec 5, 2018 · a27bac3 · a27bac3
1 parent 39b27cb
commit a27bac3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ui/tournament/src/ctrl.ts b/ui/tournament/src/ctrl.ts
@@ -42,6 +42,11 @@ export default class TournamentController {
     if (this.data.featured) this.startWatching(this.data.featured.id);
   }
 
+  askReload = (): void => {
+    if (this.joinSpinner) xhr.reloadNow(this);
+    else xhr.reloadSoon(this);
+  };
+
   reload = (data: TournamentData): void => {
     this.data = data;
     if (data.playerInfo && data.playerInfo.player.id === this.playerInfo.id)

diff --git a/ui/tournament/src/socket.ts b/ui/tournament/src/socket.ts
@@ -1,4 +1,3 @@
-import xhr from './xhr';
 import TournamentController from './ctrl';
 
 export interface TournamentSocket {
@@ -9,9 +8,7 @@ export interface TournamentSocket {
 export default function(send: SocketSend, ctrl: TournamentController) {
 
   const handlers = {
-    reload() {
-      xhr.reloadTournament(ctrl);
-    },
+    reload: ctrl.askReload,
     redirect(fullId) {
       ctrl.redirectFirst(fullId.slice(0, 8), true);
       return true;

diff --git a/ui/tournament/src/xhr.ts b/ui/tournament/src/xhr.ts
@@ -46,7 +46,7 @@ function loadPageOf(ctrl: TournamentController, userId: string): JQueryXHR {
   });
 }
 
-function reloadTournament(ctrl: TournamentController) {
+function reload(ctrl: TournamentController) {
   return $.ajax({
     url: '/tournament/' + ctrl.data.id,
     data: {
@@ -75,6 +75,7 @@ export default {
   withdraw: throttle(1000, withdraw),
   loadPage: throttle(1000, loadPage),
   loadPageOf,
-  reloadTournament: throttle(2000, reloadTournament),
+  reloadSoon: throttle(3000, reload),
+  reloadNow: reload,
   playerInfo
 };