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

Fix roomgroup in user popup (#1304)

Browse Source
This commit is contained in:
whales
2019-06-19 13:55:40 +09:30
committed by Guangcong Luo
parent bdd1bce28a
commit e4e3798fc7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/client-mainmenu.js
View File

@@ -939,7 +939,7 @@
name = name.substr(1);
}
var color = BattleLog.hashColor(toID(name));
var clickableName = '<small>' + BattleLog.escapeHTML(group) + '</small><span class="username" data-name="' + BattleLog.escapeHTML(name) + '">' + BattleLog.escapeHTML(name) + '</span>';
var clickableName = '<small>' + BattleLog.escapeHTML(group) + '</small><span class="username" data-roomgroup="' + BattleLog.escapeHTML(group) + '" data-name="' + BattleLog.escapeHTML(name) + '">' + BattleLog.escapeHTML(name) + '</span>';
var hlClass = isHighlighted ? ' highlighted' : '';
var mineClass = (window.app && app.user && app.user.get('name') === name ? ' mine' : '');

4
js/client.js
View File

@@ -2457,7 +2457,9 @@ function toId() {
update: function (data) {
if (data && data.userid === this.data.userid) {
data = _.extend(this.data, data);
UserPopup.dataCache[data.userid] = data;
// Don't cache the roomGroup
UserPopup.dataCache[data.userid] = _.clone(data);
delete UserPopup.dataCache[data.userid].roomGroup;
} else {
data = this.data;
}