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

Merge pull request #334 from sirDonovan/unlinkhide

Browse Source 
Several improvements to |unlink|hide|
This commit is contained in:
Guangcong Luo
2015-02-09 18:48:07 -06:00
parent 06c9a21e2f 8311dc889d
commit a7c01c8ece
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/battle.js
View File

@@ -5472,9 +5472,9 @@ var Battle = (function () {
var $messages = $('.chatmessage-' + user);
if (!$messages.length) break;
$messages.find('a').contents().unwrap();
if (args[2]) {
if (window.BattleRoom && args[2]) {
$messages.hide();
this.log('<div class="chatmessage-' + user + '"><button name="revealMessages" value="' + user + '"><small>' + $messages.length + ' message' + ($messages.length > 1 ? 's were' : ' was') + ' hidden, click here to restore.</small></button></div>');
this.log('<div class="chatmessage-' + user + '"><button name="revealMessages" value="' + user + '"><small>View ' + $messages.length + ' hidden message' + ($messages.length > 1 ? 's' : '') + '</small></button></div>');
}
break;
default:

2
js/client-battle.js
View File

@@ -135,7 +135,7 @@
},
revealMessages: function(user) {
var $messages = $('.chatmessage-' + user);
$messages.show();
$messages.addClass('revealed').show();
$messages.find('button').parent().remove();
},

4
js/client-chat.js
View File

@@ -1042,7 +1042,7 @@
$messages.find('a').contents().unwrap();
if (row[2]) {
$messages.hide();
this.$chat.append('<div class="chatmessage-' + user + '"><button name="revealMessages" value="' + user + '"><small>' + $messages.length + ' message' + ($messages.length > 1 ? 's were' : ' was') + ' hidden, click here to restore.</small></button></div>');
this.$chat.append('<div class="chatmessage-' + user + '"><button name="revealMessages" value="' + user + '"><small>View ' + $messages.length + ' hidden message' + ($messages.length > 1 ? 's' : '') + '</small></button></div>');
}
break;
@@ -1065,7 +1065,7 @@
},
revealMessages: function(user) {
var $messages = $('.chatmessage-' + user);
$messages.show();
$messages.addClass('revealed').show();
$messages.find('button').parent().remove();
},
tournamentButton: function(val, button) {

3
style/client.css
View File

@@ -942,6 +942,9 @@ p.or:after {
.highlighted {
background-color: #FFDDAA;
}
.revealed {
background-color: #C8FDEA;
}
.message-pm {
color: #007100;
}