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

The canonical URI for the site is www.pokemonshowdown.com

Browse Source
This commit is contained in:
Cathy J. Fitzpatrick
2013-04-29 16:34:24 -06:00
parent 29affd060f
commit d86ef53505
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@@ -53,7 +53,7 @@ RewriteCond %{HTTP_REFERER} !^https?:\/\/([a-z0-9-]+.)?(pokemonshowdown\.com|app
RewriteCond %{REMOTE_ADDR} !^69\.85\.87\.173$
RewriteRule ^.* http://www.pokemonshowdown.com/ [R=303,L]
RewriteRule ^replay/battle-([A-Za-z0-9-]+)$ http://pokemonshowdown.com/replay/$1 [R=302,L]
RewriteRule ^replay/battle-([A-Za-z0-9-]+)$ http://www.pokemonshowdown.com/replay/$1 [R=302,L]
RewriteRule ^replay/turn_(.+)\.png$ replay/turn-image.php?data=$1 [L,QSA]
RewriteCond %{QUERY_STRING} !output=html

8
js/sim.js
View File

@@ -354,7 +354,7 @@ function BattleRoom(id, elem) {
selfR.add('|chatmsg-raw|' + message.rawMessage);
} else if (message.evalRulesRedirect || message.evalRawMessage) {
// TODO: This will be removed in due course.
window.location.href = 'http://pokemonshowdown.com/rules';
window.location.href = 'http://www.pokemonshowdown.com/rules';
} else if (message.name) {
selfR.add('|chat|' + message.name.substr(1) + '|' + message.message);
} else if (message.message) {
@@ -1739,7 +1739,7 @@ function Lobby(id, elem) {
selfR.chatElem.append('<div class="message">' + Tools.sanitizeHTML(log[i].rawMessage) + '</div>');
} else if (log[i].evalRulesRedirect || log[i].evalRawMessage) {
// TODO: This will be removed in due course.
window.location.href = 'http://pokemonshowdown.com/rules';
window.location.href = 'http://www.pokemonshowdown.com/rules';
} else if (log[i].name && (log[i].action === 'join' || log[i].action === 'leave' || log[i].action === 'rename')) {
var userid = toUserid(log[i].name);
if (log[i].action === 'join') {
@@ -2675,7 +2675,7 @@ function updateMe() {
} else {
$('#userbar').html(notifybutton + '<i class="icon-user" style="color:#999"></i> ' + Tools.escapeHTML(me.name) + buttons + ' <button onclick="return rooms[\'lobby\'].formRename()" style="font-size:9pt">Choose name</button>');
}
$('#userbar').prepend('<small><a href="http://pokemonshowdown.com/" target="_blank">Website</a> &nbsp; <a href="http://pokemonshowdown.com/rules" target="_blank">Rules</a> &nbsp; </small> ');
$('#userbar').prepend('<small><a href="http://www.pokemonshowdown.com/" target="_blank">Website</a> &nbsp; <a href="http://www.pokemonshowdown.com/rules" target="_blank">Rules</a> &nbsp; </small> ');
if (rooms.lobby) {
rooms.lobby.updateMe();
rooms.lobby.debounceUpdate();
@@ -3198,7 +3198,7 @@ function overlay(overlayType, data) {
break;
case 'replayuploaded':
contents = '<p>Your replay has been uploaded! It\'s available at:</p>';
contents += '<p><a href="http://pokemonshowdown.com/replay/'+data+'" target="_blank" onclick="overlayClose()">http://pokemonshowdown.com/replay/'+data+'</a></p>';
contents += '<p><a href="http://www.pokemonshowdown.com/replay/'+data+'" target="_blank" onclick="overlayClose()">http://www.pokemonshowdown.com/replay/'+data+'</a></p>';
contents += '<p><button onclick="window.open(\'/replay/battle-'+data+'\',\'_blank\');overlayClose();return false" id="overlay_ok"><strong>Open</strong></button> <button onclick="overlayClose();return false" id="overlay_cancel">Cancel</button></p>';
focusElem = '#overlay_ok';
break;