From 8311dc889d1e7f4719054b2de11a4fadd3b6c5fa Mon Sep 17 00:00:00 2001 From: sirDonovan Date: Mon, 9 Feb 2015 17:10:07 -0600 Subject: [PATCH] Several improvements to |unlink|hide| - Prevent messages from being hidden in replays - Improve wording on the reveal button - Highlight revealed messages --- js/battle.js | 4 ++-- js/client-battle.js | 2 +- js/client-chat.js | 4 ++-- style/client.css | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/js/battle.js b/js/battle.js index 81653dd8e..0e71fbf9b 100644 --- a/js/battle.js +++ b/js/battle.js @@ -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('
'); + this.log('
'); } break; default: diff --git a/js/client-battle.js b/js/client-battle.js index 440e9d141..26fcbfa9e 100644 --- a/js/client-battle.js +++ b/js/client-battle.js @@ -135,7 +135,7 @@ }, revealMessages: function(user) { var $messages = $('.chatmessage-' + user); - $messages.show(); + $messages.addClass('revealed').show(); $messages.find('button').parent().remove(); }, diff --git a/js/client-chat.js b/js/client-chat.js index a87928359..d3d924081 100644 --- a/js/client-chat.js +++ b/js/client-chat.js @@ -1042,7 +1042,7 @@ $messages.find('a').contents().unwrap(); if (row[2]) { $messages.hide(); - this.$chat.append('
'); + this.$chat.append('
'); } 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) { diff --git a/style/client.css b/style/client.css index ba468a023..259d10b46 100644 --- a/style/client.css +++ b/style/client.css @@ -942,6 +942,9 @@ p.or:after { .highlighted { background-color: #FFDDAA; } +.revealed { + background-color: #C8FDEA; +} .message-pm { color: #007100; }