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

Battles: Fix bug in team preview

Browse Source 
Previously, a race condition would make the team preview selector appear
before we knew how many pokemon needed to be selected (e.g. 4 in VGC).

This new UI patches over that problem, although the real fix (mentioned
in the TODO comment) is to send that information in the request object.
This commit is contained in:
Guangcong Luo 2016-11-13 22:59:51 -05:00
parent 90b55aaa33
commit c182ddbd7f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/client-battle.js
View File

@ -29,10 +29,11 @@
this.$options = this.battle.optionsElem.html('<div style="padding-top: 3px; padding-right: 3px; text-align: right"><button class="icon button" name="openBattleOptions" title="Options">Battle Options</button></div>');
this.battle.customCallback = _.bind(this.updateControls, this);
this.battle.endCallback = _.bind(this.updateControls, this);
this.battle.startCallback = _.bind(this.updateControls, this);
this.battle.stagnateCallback = _.bind(this.updateControls, this);
var self = this;
this.battle.customCallback = function () { self.updateControls(); };
this.battle.endCallback = function () { self.updateControls(); };
this.battle.startCallback = function () { self.updateControls(); };
this.battle.stagnateCallback = function () { self.updateControls(); };
this.battle.play();
},
@ -255,7 +256,7 @@
// player
this.controlsShown = true;
if (force || !controlsShown || typeof this.choice === 'undefined' || this.choice && this.choice.waiting) {
if (force || !controlsShown || this.choice === undefined || this.choice && this.choice.waiting) {
// don't update controls (and, therefore, side) if `this.choice === null`: causes damage miscalculations
this.updateControlsForPlayer();
} else {
@ -365,6 +366,11 @@
break;
case 'team':
if (this.battle.mySide.pokemon && !this.battle.mySide.pokemon.length) {
// too early, we can't determine `this.choice.count` yet
// TODO: send teamPreviewCount in the request object
return;
}
if (!this.choice) {
this.choice = {
preDecided: preDecided,