From 4b3e84ce5129720c8dcbff35a0bde490baf00ab9 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Thu, 28 Mar 2013 23:32:46 +0000 Subject: [PATCH] merge #86, with some tweaks in the case AT_PLAYER area so it's cleaner --- code/chat.js | 17 +++++++++++------ style.css | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/code/chat.js b/code/chat.js index 1df65472..84e7c96d 100644 --- a/code/chat.js +++ b/code/chat.js @@ -256,6 +256,7 @@ window.chat.writeDataToHash = function(newData, storageHash, skipSecureMsgs) { if(json[0] in storageHash) return true; var skipThisEntry = false; + var msgToPlayer = false; var time = json[1]; var team = json[2].plext.team === 'ALIENS' ? TEAM_ENL : TEAM_RES; @@ -276,13 +277,13 @@ window.chat.writeDataToHash = function(newData, storageHash, skipSecureMsgs) { break; case 'TEXT': - var tmp = $('
').text(markup[1].plain).html().autoLink(); - msg += tmp.replace(window.PLAYER['nickMatcher'], '$1'); + msg += $('
').text(markup[1].plain).html().autoLink(); break; case 'AT_PLAYER': - var tmp = $('
').text(markup[1].plain).html().autoLink(); - msg += tmp.replace(window.PLAYER['nickMatcher'], '$1'); + msgToPlayer = (markup[1].plain == ('@'+window.PLAYER.nickname)); + var spanClass = msgToPlayer ? "pl_nudge_me" : (markup[1].team + " pl_nudge_player"); + msg += $('
').html($('').attr('class', spanClass).text(markup[1].plain)).html(); break; case 'PORTAL': @@ -307,7 +308,7 @@ window.chat.writeDataToHash = function(newData, storageHash, skipSecureMsgs) { if(skipThisEntry) return true; // format: timestamp, autogenerated, HTML message, player guid - storageHash[json[0]] = [json[1], auto, chat.renderMsg(msg, nick, time, team), pguid]; + storageHash[json[0]] = [json[1], auto, chat.renderMsg(msg, nick, time, team, msgToPlayer), pguid]; window.setPlayerName(pguid, nick); // free nick name resolves }); @@ -357,11 +358,15 @@ window.chat.renderDivider = function(text) { } -window.chat.renderMsg = function(msg, nick, time, team) { +window.chat.renderMsg = function(msg, nick, time, team, msgToPlayer) { var ta = unixTimeToHHmm(time); var tb = unixTimeToString(time, true); // help cursor via “#chat time” var t = ''; + if ( msgToPlayer ) + { + t = '
' + t + '
'; + } var s = 'style="cursor:pointer; color:'+COLORS[team]+'"'; var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : ''; var i = ['<', '>']; diff --git a/style.css b/style.css index 8190eb7b..96ae1e92 100644 --- a/style.css +++ b/style.css @@ -777,3 +777,41 @@ td + td { width: 50px; text-align: right; } + +.pl_nudge_date { + background-color: #724510; + border-left: 1px solid #ffd652; + border-bottom: 1px solid #ffd652; + border-top: 1px solid #ffd652; + color: #ffd652; + display: inline-block; + float: left; + font-size: 12px; + height: 18px; + text-align: center; +} + +.pl_nudge_pointy_spacer { + background: no-repeat url(//commondatastorage.googleapis.com/ingress.com/img/nudge_pointy.png); + display: inline-block; + float: left; + height: 20px; + left: 47px; + width: 5px; +} + +.pl_nudge_player { + cursor: pointer; +} + +.pl_nudge_me { + color: #ffd652; +} + +.RESISTANCE { + color: #00c2ff; +} + +.ALIENS { + color: #28f428; +}