-
diff --git a/js/battle.js b/js/battle.js
index ac8cbc3d6..b62f42b79 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -5874,7 +5874,7 @@ var Battle = (function () {
this.paused = true;
this.playbackState = 3;
if (this.resumeButton) {
- this.frameElem.append('');
+ this.frameElem.append('');
this.frameElem.find('div.playbutton button').click(this.resumeButton);
}
this.soundPause();
diff --git a/js/client-battle.js b/js/client-battle.js
index 560f8dfb1..6579dbf4b 100644
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -189,7 +189,7 @@
} else if (this.battle.playbackState === 2 || this.battle.playbackState === 3) {
// battle is playing or paused
- this.$controls.html('');
+ this.$controls.html('');
return;
}
@@ -223,9 +223,9 @@
// battle has ended
if (this.side) {
// was a player
- this.$controls.html('');
+ this.$controls.html('');
} else {
- this.$controls.html('');
+ this.$controls.html('');
}
} else if (!this.battle.mySide.initialized || !this.battle.yourSide.initialized) {
diff --git a/js/client-ladder.js b/js/client-ladder.js
index e6df3e906..59873d0d1 100644
--- a/js/client-ladder.js
+++ b/js/client-ladder.js
@@ -8,7 +8,7 @@
app.on('init:formats', this.update, this);
this.update();
app.on('response:laddertop', function (data) {
- var buf = '
Latest News
+Latest News
';
+ var buf = '');
+ this.$el.html('');
if (app.localLadder) {
app.send('/cmd laddertop ' + format);
} else {
@@ -54,7 +54,7 @@
output: 'html'
}, function (data) {
if (self.curFormat !== format) return;
- var buf = '
';
if (!data) {
this.$el.html(buf + '
');
return;
@@ -44,7 +44,7 @@
} else {
var format = this.curFormat;
var self = this;
- this.$el.html('error
Loading...
Loading...
';
+ var buf = ' ' + Tools.escapeHTML(set.name) + '';
}
if (i !== data.i && i !== data.i + 1) {
- buf += '';
+ buf += '';
}
buf += '';
this.$el.html(buf);
diff --git a/js/client.js b/js/client.js
index 8fd0ea564..1cf3c3b1a 100644
--- a/js/client.js
+++ b/js/client.js
@@ -1682,9 +1682,9 @@
var name = ' ' + app.user.get('name');
var color = hashColor(app.user.get('userid'));
if (app.user.get('named')) {
- buf = ' ' + Tools.escapeHTML(name) + ' ';
+ buf = ' ' + Tools.escapeHTML(name) + ' ';
} else {
- buf = ' ';
+ buf = ' ';
}
this.$userbar.html(buf);
},
@@ -1710,13 +1710,13 @@
var buf = '';
switch (id) {
case '':
- return buf + ' Home ';
+ return buf + ' Home';
case 'teambuilder':
- return buf + ' Teambuilder';
+ return buf + ' Teambuilder';
case 'ladder':
- return buf + ' Ladder';
+ return buf + ' Ladder';
case 'rooms':
- return buf + ' ';
+ return buf + ' ';
default:
if (id.substr(0, 7) === 'battle-') {
var name = Tools.escapeHTML(room.title);
@@ -1732,9 +1732,9 @@
name = '(empty room)';
}
}
- return buf + '' + formatid + '' + name + '';
+ return buf + '' + formatid + '' + name + '';
} else {
- return buf + ' ' + (Tools.escapeHTML(room.title) || (id === 'lobby' ? 'Lobby' : id)) + '';
+ return buf + ' ' + (Tools.escapeHTML(room.title) || (id === 'lobby' ? 'Lobby' : id)) + '';
}
}
},
@@ -1746,9 +1746,9 @@
var curId = (app.curRoom ? app.curRoom.id : '');
var curSideId = (app.curSideRoom ? app.curSideRoom.id : '');
- var buf = '
';
buf += '
';
self.$el.html(buf);
diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index f0cee3289..b28d5f6d7 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -88,7 +88,7 @@
options.append = options.append || false;
options.noMinimize = options.noMinimize || false;
- this.$pmBox[options.append ? 'append' : 'prepend']('' + Tools.escapeFormat(format) + ' Top 500
'; buf += data + '' + (!options.noMinimize ? '' : '') + options.title + '
' +
+ this.$pmBox[options.append ? 'append' : 'prepend']('');
},
@@ -161,8 +161,8 @@
group = '' + Tools.escapeHTML(group) + '';
}
var buf = ' ';
}
}
- buf += '';
+ buf += '';
buf += '';
if (window.nodewebkit) {
- buf += ' ';
+ buf += ' ';
} else {
- buf += '';
+ buf += '';
buf += ' ';
+ buf = ' ';
buf += '';
} else {
- buf = ' ';
+ buf = ' ';
buf += '';
if (!set.species) {
if (this.deletedSet) {
- buf += '';
+ buf += '';
}
buf += ' ';
return buf;
}
- buf += '';
+ buf += '';
buf += '';
@@ -892,7 +892,7 @@
updateSetView: function () {
// pokemon
var buf = '
';
buf += '';
@@ -910,7 +910,7 @@
// import/export
buf += '';
- buf += '';
- buf += '';
+ buf += '
';
@@ -455,7 +455,7 @@
} else {
$formatButton.addClass('preselected')[0].disabled = true;
$teamButton.addClass('preselected')[0].disabled = true;
- $searchForm.find('button.big').html(' Searching...').addClass('disabled');
+ $searchForm.find('button.big').html(' Searching...').addClass('disabled');
var searchEntries = $.isArray(this.searching) ? this.searching : [this.searching];
for (var i = 0; i < searchEntries.length; i++) {
var format = searchEntries[i].format || searchEntries[i];
@@ -753,7 +753,7 @@
$formatButton.addClass('preselected')[0].disabled = true;
$teamButton.addClass('preselected')[0].disabled = true;
- $searchForm.find('button.big').html(' Connecting...').addClass('disabled');
+ $searchForm.find('button.big').html(' Connecting...').addClass('disabled');
$searchForm.append('');
app.sendTeam(team);
@@ -920,7 +920,7 @@
var BattleListPopup = this.BattleListPopup = Popup.extend({
type: 'modal',
initialize: function () {
- var buf = '';
- buf += '';
+ buf += '';
+ buf += '';
buf += group + Tools.escapeHTML(name.substr(1)) + '
';
buf += '';
buf += '
'; + var buf = '
'; buf += '
Clearing your cookies (specifically, localStorage) will delete your teams.
If you want to clear your cookies or localStorage, you can use the Backup/Restore feature to save your teams as text first.
';
buf += '
';
@@ -541,13 +541,13 @@
var buf = '- ';
buf += '
- ' + this.clipboardHTML() + ' '; @@ -509,25 +509,25 @@ } } if (curSection) buf += ''; - buf += ''; + buf += ''; } if (!this.curSetList.length) { buf += '
- you have no pokemon lol '; } for (i = 0; i < this.curSetList.length; i++) { if (this.curSetList.length < 6 && this.deletedSet && i === this.deletedSetLoc) { - buf += ''; + buf += ''; } buf += this.renderSet(this.curSetList[i], i); } if (this.deletedSet && i === this.deletedSetLoc) { - buf += ''; + buf += ''; } if (i === 0) { - buf += ''; + buf += ''; } if (i < 6) { - buf += ''; + buf += ''; } buf += '
';
buf += '
';
buf += '';
buf += '
';
@@ -698,9 +698,9 @@
buf += '' + this.clipboardInnerHTML() + '
';
buf += '';
buf += '';
- buf += '
';
+ buf += '';
- buf += '';
+ buf += '';
buf += '';
buf += '
';
@@ -932,16 +932,16 @@
var set = this.curSetList[i];
var pokemonicon = '';
if (!set.name) {
- buf += ' ';
+ buf += ' ';
isAdd = true;
} else if (i == this.curSetLoc) {
- buf += ' ';
+ buf += ' ';
} else {
buf += ' ';
}
}
if (this.curSetList.length < 6 && !isAdd) {
- buf += ' ';
+ buf += ' ';
}
return buf;
},
@@ -2270,12 +2270,12 @@
for (var i = 0; i < data.team.length; i++) {
var set = data.team[i];
if (i !== data.i && i !== data.i + 1) {
- buf += '';
+ buf += '';
}
buf += '- Home '; - if (app.rooms['teambuilder']) buf += '
- Teambuilder '; - if (app.rooms['ladder']) buf += '
- Ladder '; + var buf = '
- Home '; + if (app.rooms['teambuilder']) buf += '
- Teambuilder '; + if (app.rooms['ladder']) buf += '
- Ladder '; buf += '
- ' + name + ' '; + sideBuf += '
- ' + name + ' '; if (curSideId) { // get left/right for side rooms if (curSideId === id) { @@ -1811,7 +1811,7 @@ buf += '
- ' + name + ' '; + buf += '
- ' + name + ' '; // get left/right if (curId === id) { passedCurRoom = true; @@ -1825,7 +1825,7 @@ if (nwWindow.setBadgeLabel) nwWindow.setBadgeLabel(notificationCount || ''); } if (app.supports['rooms']) { - sideBuf += '
- '; + sideBuf += '
- '; } if (atLeastOne) buf += '
- Home '; - if (app.rooms['teambuilder']) buf += '
- Teambuilder '; - if (app.rooms['ladder']) buf += '
- Ladder '; + var buf = '
- Home '; + if (app.rooms['teambuilder']) buf += '
- Teambuilder '; + if (app.rooms['ladder']) buf += '
- Ladder '; buf += '
- ' + name + ' '; + if (room.id !== 'rooms') sideBuf += '
- ' + name + ' '; continue; } if (!atLeastOne) { buf += '
- ' + name + ' '; + buf += '
- ' + name + ' '; } if (app.supports['rooms']) { - sideBuf += '
- '; + sideBuf += '
- '; } if (atLeastOne) buf += '
- ';
atLeastOne = true;
}
- buf += '
- ' + this.renderRoomTab(app.curRoom) + '
- ';
atLeastOne = true;
}
- buf += '