Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-09 04:23:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only initialise the tournament box when a tournament packet is detected, rather than for every room

Browse Source
This commit is contained in:
小太 2013-12-09 16:38:50 +11:00
parent 59ccc575a9
commit 2cbc43d22d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/client-chat.js
View File

@ -644,7 +644,7 @@
this.$chatbox = null;
this.$tournamentWrapper = this.$('.tournament-wrapper');
this.tournamentBox = new TournamentBox(this, this.$tournamentWrapper);
this.tournamentBox = null;
this.users = {};
this.userCount = {};
@ -674,7 +674,7 @@
this.$tournamentWrapper.removeClass('hasuserlist');
}
this.$chatFrame.scrollTop(this.$chat.height());
this.tournamentBox.updateLayout();
if (this.tournamentBox) this.tournamentBox.updateLayout();
},
show: function() {
Room.prototype.show.apply(this, arguments);
@ -826,6 +826,7 @@
case 'tournament':
case 'tournaments':
if (!this.tournamentBox) this.tournamentBox = new TournamentBox(this, this.$tournamentWrapper);
if (!this.tournamentBox.parseMessage(row.slice(1), row[0] === 'tournaments'))
break;
// fallthrough in case of unparsed message
@ -841,7 +842,7 @@
}
},
tournamentButton: function(val, button) {
this.tournamentBox[$(button).data('type')](val, button);
if (this.tournamentBox) this.tournamentBox[$(button).data('type')](val, button);
},
parseUserList: function(userList) {
this.userCount = {};