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

Fix lint errors

Browse Source
This commit is contained in:
Kirk Scheibelhut
2019-07-03 12:11:27 -07:00
parent 585c9643f8
commit be507a4cee
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/client-topbar.js
View File

@@ -502,7 +502,7 @@
if (window.Notification) {
buf += '<p><label class="optlabel"><input type="checkbox" name="temporarynotifications"' + (Dex.prefs('temporarynotifications') ? ' checked' : '') + ' /> Notifications disappear automatically</label></p>';
}
buf +=' <p><label class="optlabel"><input type="checkbox" name="refreshprompt"' + (Dex.prefs('refreshprompt') ? ' checked' : '') + '> Prompt on refresh</label></p>';
buf += '<p><label class="optlabel"><input type="checkbox" name="refreshprompt"' + (Dex.prefs('refreshprompt') ? ' checked' : '') + '> Prompt on refresh</label></p>';
var tours = Dex.prefs('tournaments') || 'notify';
buf += '<p><label class="optlabel">Tournaments: <select name="tournaments"><option value="notify"' + (tours === 'notify' ? ' selected="selected"' : '') + '>Notifications</option><option value="nonotify"' + (tours === 'nonotify' ? ' selected="selected"' : '') + '>No Notifications</option><option value="hide"' + (tours === 'hide' ? ' selected="selected"' : '') + '>Hide</option></select></label></p>';

3
src/battle-tooltips.ts
View File

@@ -1579,7 +1579,8 @@ class BattleTooltips {
abilityData.baseAbility = clientPokemon.baseAbility;
}
} else {
const template = this.battle.dex.getTemplate(clientPokemon.getSpecies() || (serverPokemon && serverPokemon.species) || '');
const species = clientPokemon.getSpecies() || (serverPokemon && serverPokemon.species) || '';
const template = this.battle.dex.getTemplate(species);
if (template.exists && template.abilities) {
abilityData.possibilities = [template.abilities['0']];
if (template.abilities['1']) abilityData.possibilities.push(template.abilities['1']);