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

Fix style error

Browse Source
This commit is contained in:
Guangcong Luo 2021-05-14 04:51:48 -04:00
parent 948a73fce6
commit 3d6b33e27f
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/client.js
View File

@ -402,7 +402,7 @@ function toId() {
this.supports = {};
// down
// if (document.location.hostname === 'play.pokemonshowdown.com') this.down = 'dos';
// if (document.location.hostname === 'play.pokemonshowdown.com') this.down = true;
this.addRoom('');
this.topbar = new Topbar({el: $('#header')});
@ -831,14 +831,16 @@ function toId() {
}
this.socket.send(data);
},
serializeForm: function (form) {
serializeForm: function (form, checkboxOnOff) {
// querySelector dates back to IE8 so we can use it
// fortunate, because form serialization is a HUGE MESS in older browsers
var elements = form.querySelectorAll('input[name], select[name], textarea[name], keygen[name]');
var out = [];
for (var i = 0; i < elements.length; i++) {
var element = elements[i];
if (!['checkbox', 'radio'].includes(element.type) || element.checked) {
if (element.type === 'checkbox' && !element.value && checkboxOnOff) {
out.push([element.name, element.checked ? 'on' : 'off']);
} else if (!['checkbox', 'radio'].includes(element.type) || element.checked) {
out.push([element.name, element.value]);
}
}
@ -853,10 +855,11 @@ function toId() {
var dataSend = target.getAttribute('data-submitsend');
if (dataSend) {
var toSend = dataSend;
var entries = this.serializeForm(target);
var entries = this.serializeForm(target, true);
for (var i = 0; i < entries.length; i++) {
toSend = toSend.replace('{' + entries[i][0] + '}', entries[i][1]);
}
toSend = toSend.replace(/\{[a-z]+\}/g, '');
this.send(toSend);
e.currentTarget.innerText = 'Submitted!';
e.preventDefault();
@ -1537,9 +1540,9 @@ function toId() {
// otherwise, infer the room type
if (!type) {
if (id.slice(0, 7) === 'battle-') {
if (id.startsWith('battle-') || id.startsWith('game-')) {
type = BattleRoom;
} else if (id.slice(0, 5) === 'view-') {
} else if (id.startsWith('view-')) {
type = HTMLRoom;
} else {
type = ChatRoom;

2
src/battle-tooltips.ts
View File

@ -2131,7 +2131,7 @@ class BattleStatGuesser {
} else if (['counter', 'endeavor', 'metalburst', 'mirrorcoat', 'rapidspin'].includes(move.id)) {
moveCount['Support']++;
} else if ([
'nightshade', 'seismictoss', 'psywave', 'superfang', 'naturesmadness', 'foulplay', 'endeavor', 'finalgambit', 'bodypress'
'nightshade', 'seismictoss', 'psywave', 'superfang', 'naturesmadness', 'foulplay', 'endeavor', 'finalgambit', 'bodypress',
].includes(move.id)) {
moveCount['Offense']++;
} else if (move.id === 'fellstinger') {

1
style/battle.css
View File

@ -14,6 +14,7 @@ License: GPLv2
left: -1px;
border: 1px solid #AAAAAA;
background: #CFD5DA;
color: black;
width: 640px;
height: 360px;
overflow: hidden;