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

Make sure Staff and Upper Staff are first

Browse Source 
This is a dumb hack to make sure that Staff and Upper Staff are to
the left of any autojoined rooms. They're excluded from autojoin, so
without this, they would be all the way on the right.
This commit is contained in:
Guangcong Luo
2015-06-11 18:29:40 -04:00
parent 547629ba28
commit e5b3326703
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/client-mainmenu.js
View File

@@ -313,6 +313,7 @@
var handlerRoom = app.curSideRoom;
if (!handlerRoom) {
for (var roomid in app.rooms) {
if (!app.rooms[roomid]) continue;
if (!app.rooms[roomid].handleTabComplete) continue;
handlerRoom = app.rooms[roomid];
break;

7
js/client.js
View File

@@ -303,6 +303,9 @@
this.topbar = new Topbar({el: $('#header')});
this.addRoom('');
if (!this.down && $(window).width() >= 916) {
// make sure staff and upperstaff are first in room list
this.rooms.staff = undefined;
this.rooms.upperstaff = undefined;
if (document.location.hostname === 'play.pokemonshowdown.com') {
this.addRoom('rooms', null, true);
var autojoin = (Tools.prefs('autojoin') || '');
@@ -1372,7 +1375,7 @@
// no room for this room
} else if (!this.sideRoom) {
for (var i in this.rooms) {
if (this.rooms[i].isSideRoom) {
if (this.rooms[i] && this.rooms[i].isSideRoom) {
this.sideRoom = this.rooms[i];
}
}
@@ -1581,6 +1584,7 @@
var notificationCount = 0;
for (var id in app.rooms) {
if (!app.rooms[id]) continue;
if (app.rooms[id].notifications) notificationCount++;
if (!id || id === 'teambuilder' || id === 'ladder') continue;
var room = app.rooms[id];
@@ -2717,6 +2721,7 @@
for (var id in app.rooms) {
if (!id || id === 'teambuilder' || id === 'ladder') continue;
var room = app.rooms[id];
if (!room) continue;
var name = '<i class="icon-comment-alt"></i> <span>'+id+'</span>';
if (id === 'lobby') name = '<i class="icon-comments-alt"></i> <span>Lobby</span>';
if (id.substr(0,7) === 'battle-') {