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

Fix crash when watching battles before formats loaded

Browse Source
This commit is contained in:
Guangcong Luo 2013-05-22 23:37:14 -05:00
parent b2315f57f9
commit 613d12ca6b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/client-mainmenu.js
View File

@ -470,6 +470,7 @@
// buttons
search: function(i, button) {
if (!window.BattleFormats) return;
this.requestNotifications();
var $searchForm = $(button).closest('form');
if ($searchForm.find('.cancel').length) {
@ -644,10 +645,12 @@
var buf = '<div class="roomlist"><p><button name="refresh"><i class="icon-refresh"></i> Refresh</button> <button name="close"><i class="icon-remove"></i> Close</button></p>';
buf += '<p><label>Format:</label><select name="format"><option value="">(All formats)</option>';
for (var i in BattleFormats) {
if (BattleFormats[i].searchShow) {
var activeFormat = (this.format === i?' selected=':'');
buf += '<option value="'+i+'"'+activeFormat+'>'+BattleFormats[i].name+'</option>';
if (window.BattleFormats) {
for (var i in BattleFormats) {
if (BattleFormats[i].searchShow) {
var activeFormat = (this.format === i?' selected=':'');
buf += '<option value="'+i+'"'+activeFormat+'>'+BattleFormats[i].name+'</option>';
}
}
}
buf += '</select></p>';
@ -656,6 +659,7 @@
this.$el.html(buf);
this.$list = this.$('.list');
app.on('init:formats', this.initialize, this);
app.on('response:roomlist', this.update, this);
app.send('/cmd roomlist');
this.update();