diff --git a/js/battle.js b/js/battle.js
index f3f46d7cc..f3a26a1b8 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -5259,9 +5259,9 @@ var Battle = (function () {
}
var message = args.join('|');
if (message.substr(0,2) === '//') {
- this.log('' + clickableName + ': ' + Tools.parseMessage(message.substr(1), name) + '
', preempt);
+ this.log('' + clickableName + ': ' + Tools.parseMessage(message.substr(1)) + '
', preempt);
} else if (message.substr(0,4).toLowerCase() === '/me ') {
- this.log('• ' + clickableName + ' ' + Tools.parseMessage(message.substr(4), name) + '
', preempt);
+ this.log('• ' + clickableName + ' ' + Tools.parseMessage(message.substr(4)) + '
', preempt);
} else if (message.substr(0,14).toLowerCase() === '/data-pokemon ') {
if (window.Chart) this.log(''+Chart.pokemonRow(Tools.getTemplate(message.substr(14)),'',{})+'
'+Chart.moveRow(Tools.getMove(message.substr(11)),'',{})+'
' + clickableName + ': ' + Tools.parseMessage(message, name) + '
', preempt);
+ this.log('' + clickableName + ': ' + Tools.parseMessage(message) + '
', preempt);
}
break;
case 'chatmsg':
@@ -5457,6 +5457,13 @@ var Battle = (function () {
this.log('[DEBUG] ' + Tools.escapeHTML(name) + '.
$1');
// linking of URIs
if (!options.hidelinks) {
- var classbit = '';
- if (linkclass) {
- classbit = ' class="message-link-' + toId(linkclass) + '"';
- }
str = str.replace(/https?\:\/\/[a-z0-9-.]+(?:\:[0-9]+)?(?:\/(?:[^\s]*[^\s?.,])?)?|[a-z0-9.]+\@[a-z0-9.]+\.[a-z0-9]{2,3}|(?:[a-z0-9](?:[a-z0-9-\.]*[a-z0-9])?\.(?:com|org|net|edu|us|jp)(?:\:[0-9]+)?|qmark\.tk)(?:(?:\/(?:[^\s]*[^\s?.,])?)?)\b/ig, function(uri) {
if (/[a-z0-9.]+\@[a-z0-9.]+\.[a-z0-9]{2,3}/ig.test(uri)) {
- return ''+uri+'';
+ return ''+uri+'';
}
// Insert http:// before URIs without a URI scheme specified.
var fulluri = uri.replace(/^([a-z]*[^a-z:])/g, 'http://$1');
@@ -361,8 +357,7 @@ var Tools = {
event + '\', \'' + Tools.escapeQuotes(fulluri) + '\');';
}
return '' + uri + '';
+ '" target="_blank" onclick="' + onclick + '">' + uri + '';
});
// google [blah]
// google[blah]
@@ -370,7 +365,7 @@ var Tools = {
str = str.replace(/\bgoogle ?\[([^\]<]+)\]/ig, function(p0, p1) {
p1 = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1)));
return '' + p0 + '';
+ '" target="_blank">' + p0 + '';
});
// gl [blah]
// gl[blah]
@@ -378,21 +373,21 @@ var Tools = {
str = str.replace(/\bgl ?\[([^\]<]+)\]/ig, function(p0, p1) {
p1 = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1)));
return '' + p0 + '';
+ '" target="_blank">' + p0 + '';
});
// wiki [blah]
// Search Wikipedia for 'blah' (and visit the article for 'blah' if it exists)
str = str.replace(/\bwiki ?\[([^\]<]+)\]/ig, function(p0, p1) {
p1 = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1)));
return '' + p0 + '';
+ p1 + '" target="_blank">' + p0 + '';
});
// [[blah]]
// Short form of gl[blah]
str = str.replace(/\[\[([^< ](?:[^<`]*?[^< ])?)\]\]/ig, function(p0, p1) {
var q = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1)));
return '' + p1 +'';
+ '" target="_blank">' + p1 +'';
});
}
// __italics__
diff --git a/js/client-battle.js b/js/client-battle.js
index 0a52a42d2..b5ad2fcf6 100644
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -133,6 +133,11 @@
this.battle.add('', Tools.prefs('noanim'));
this.updateControls();
},
+ revealMessages: function(user) {
+ var $messages = $('.chatmessage-' + user);
+ $messages.show();
+ $messages.find('button').parent().remove();
+ },
/*********************************************************
* Battle stuff
diff --git a/js/client-chat.js b/js/client-chat.js
index 5626ffb8a..f3c0f021b 100644
--- a/js/client-chat.js
+++ b/js/client-chat.js
@@ -993,9 +993,13 @@
case 'unlink':
// note: this message has global effects, but it's handled here
// so that it can be included in the scrollback buffer.
- $('.message-link-' + toId(row[1])).each(function() {
- $(this).replaceWith($(this).html());
- });
+ var user = toId(row[2]) || toId(row[1]);
+ var $messages = $('.chatmessage-' + user);
+ $messages.find('a').contents().unwrap();
+ if (row[2]) {
+ $messages.hide();
+ this.$chat.append('');
+ }
break;
case 'tournament':
@@ -1015,6 +1019,11 @@
}
}
},
+ revealMessages: function(user) {
+ var $messages = $('.chatmessage-' + user);
+ $messages.show();
+ $messages.find('button').parent().remove();
+ },
tournamentButton: function(val, button) {
if (this.tournamentBox) this.tournamentBox[$(button).data('type')](val, button);
},
@@ -1152,23 +1161,23 @@
}
}
var highlight = isHighlighted ? ' highlighted' : '';
- var chatDiv = '';
+ var chatDiv = '
';
var timestamp = ChatRoom.getTimestamp('lobby', deltatime);
if (name.charAt(0) !== ' ') clickableName = '' + Tools.escapeHTML(name.charAt(0)) + ''+clickableName;
var self = this;
var outputChat = function() {
- self.$chat.append(chatDiv + timestamp + '' + clickableName + ': ' + Tools.parseMessage(message, name) + '
');
+ self.$chat.append(chatDiv + timestamp + '
' + clickableName + ': ' + Tools.parseMessage(message) + '' + timestamp + '' + clickableName + ': (Private to ' + Tools.escapeHTML(pm) + ') ' + Tools.parseMessage(message, name) + '
');
+ this.$chat.append('' + timestamp + '' + clickableName + ': (Private to ' + Tools.escapeHTML(pm) + ') ' + Tools.parseMessage(message) + '
');
} else if (message.substr(0,4) === '/me ') {
message = message.substr(4);
if (showme) {
- this.$chat.append(chatDiv + timestamp + '• ' + clickableName + ' ' + Tools.parseMessage(message, name) + '');
+ this.$chat.append(chatDiv + timestamp + '• ' + clickableName + ' ' + Tools.parseMessage(message) + '');
} else {
outputChat();
}
@@ -1176,13 +1185,13 @@
} else if (message.substr(0,5) === '/mee ') {
message = message.substr(5);
if (showme) {
- this.$chat.append(chatDiv + timestamp + '• ' + clickableName + '' + Tools.parseMessage(message, name) + '');
+ this.$chat.append(chatDiv + timestamp + '• ' + clickableName + '' + Tools.parseMessage(message) + '');
} else {
outputChat();
}
Storage.logChat(this.id, '* '+name+message);
} else if (message.substr(0,10) === '/announce ') {
- this.$chat.append(chatDiv + timestamp + '' + clickableName + ': ' + Tools.parseMessage(message.substr(10), name) + '');
+ this.$chat.append(chatDiv + timestamp + '' + clickableName + ': ' + Tools.parseMessage(message.substr(10)) + '');
Storage.logChat(this.id, ''+name+': /announce '+message);
} else if (message.substr(0,14) === '/data-pokemon ') {
this.$chat.append(''+Chart.pokemonRow(Tools.getTemplate(message.substr(14)),'',{})+'
' + timestamp + '• ' + clickableName + ' ' + Tools.parseMessage(message.substr(4), name) + '
');
+ $chat.append('' + timestamp + '• ' + clickableName + ' ' + Tools.parseMessage(message.substr(4)) + '
');
} else if (message.substr(0,5) === '/mee ') {
- $chat.append('' + timestamp + '• ' + clickableName + '' + Tools.parseMessage(message.substr(5), name) + '
');
+ $chat.append('' + timestamp + '• ' + clickableName + '' + Tools.parseMessage(message.substr(5)) + '
');
} else if (message.substr(0,8) === '/invite ') {
var roomid = toRoomid(message.substr(8));
$chat.append('' + timestamp + '' + clickableName + ' invited you to join the room "'+roomid+'"
');
$chat.append('');
} else if (message.substr(0,10) === '/announce ') {
- $chat.append('' + timestamp + '' + clickableName + ': ' + Tools.parseMessage(message.substr(10), name) + '
');
+ $chat.append('' + timestamp + '' + clickableName + ': ' + Tools.parseMessage(message.substr(10)) + '
');
} else if (message.substr(0,14) === '/data-pokemon ') {
$chat.append(''+Chart.pokemonRow(Tools.getTemplate(message.substr(14)),'',{})+'
' + timestamp + '' + clickableName + ': ' + Tools.parseMessage(message, name) + '
');
+ $chat.append('' + timestamp + '' + clickableName + ': ' + Tools.parseMessage(message) + '
');
}
if (autoscroll) {