Skip to content

Commit

Permalink
Improve Formats dropdown in Watch Battle
Browse files Browse the repository at this point in the history
  • Loading branch information
Zarel committed Feb 22, 2016
1 parent 6b186a6 commit c98ebe8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion js/client-mainmenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@
var $teamButton = this.sourceEl.closest('form').find('button[name=team]');
if ($teamButton.length) $teamButton.replaceWith(app.rooms[''].renderTeams(format));
}
this.sourceEl.val(format).html(Tools.escapeFormat(format));
this.sourceEl.val(format).html(Tools.escapeFormat(format) || '(Select a format)');

this.close();
}
Expand Down
2 changes: 1 addition & 1 deletion js/client-rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
this.$el.addClass('ps-room-light').addClass('scrollable');
var buf = '<div class="pad"><button class="button" style="float:right;font-size:10pt;margin-top:3px" name="close"><i class="fa fa-times"></i> Close</button><div class="roomlist"><p><button class="button" name="refresh"><i class="fa fa-refresh"></i> Refresh</button> <span style="' + Tools.getPokemonIcon('meloetta-pirouette') + ';display:inline-block;vertical-align:middle" class="picon" title="Meloetta is PS\'s mascot! The Pirouette forme is Fighting-type, and represents our battles."></span></p>';

buf += '<p><label>Format:</label><br /><button class="select formatselect" name="selectFormat">(All formats)</button></p>';
buf += '<p><label class="label">Format:</label><button class="select formatselect" name="selectFormat">(All formats)</button></p>';
buf += '<div class="list"><p>Loading...</p></div>';
buf += '</div></div>';

Expand Down

0 comments on commit c98ebe8

Please sign in to comment.