Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-07 03:17:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from kotarou3/autolinkingFix

Browse Source 
Add port number detection to automatic links
This commit is contained in:
Guangcong Luo
2013-09-17 18:58:53 -07:00
parent fd46478a27 2cbc7537e5
commit 03c2bf532a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/battledata.js
View File

@@ -317,13 +317,13 @@ var Tools = {
options.hidestrikethrough ? '$1' : '<s>$1</s>');
// linking of URIs
if (!options.hidelinks) {
str = str.replace(/(https?\:\/\/[a-z0-9-.]+(\/([^\s]*[^\s?.,])?)?|[a-z0-9]([a-z0-9-\.]*[a-z0-9])?\.(com|org|net|edu|us)((\/([^\s]*[^\s?.,])?)?|\b))/ig, function(uri) {
str = str.replace(/(https?\:\/\/[a-z0-9-.]+(\:[0-9]+)?(\/([^\s]*[^\s?.,])?)?|[a-z0-9]([a-z0-9-\.]*[a-z0-9])?\.(com|org|net|edu|us)(\:[0-9]+)?((\/([^\s]*[^\s?.,])?)?|\b))/ig, function(uri) {
// Insert http:// before URIs without a URI scheme specified.
var fulluri = uri.replace(/^([a-z]*[^a-z:])/g, 'http://$1');
var onclick;
var r = new RegExp('^https?://' +
document.location.hostname.replace(/\./g, '\\.') +
'/([a-zA-Z0-9-]+)$');
'(\\:[0-9]+)?/([a-zA-Z0-9-]+)$');
var m = r.exec(fulluri);
if (m) {
onclick = "return selectTab('" + m[1] + "');";
@@ -891,4 +891,3 @@ var Tools = {
return '<img src="' + Tools.resourcePrefix + 'sprites/types/'+sanitizedType+'.png" alt="'+type+'" height="14" width="32"'+(b?' class="b"':'')+' />';
}
};