Preact: Make client usable again

A few updates seem to have made the Preact client stop working, but this
restores it to working state again.
This commit is contained in:
Guangcong Luo
2025-04-03 15:47:46 -07:00
parent 4044099b9b
commit 4dcecc9fc8
5 changed files with 12 additions and 4 deletions

5
.vscode/tasks.json vendored
View File

@@ -4,7 +4,10 @@
{
"type": "npm",
"script": "build",
"group": "build",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [],
"label": "npm: build",
"detail": "node build"

View File

@@ -55,6 +55,7 @@
<script defer src="/config/config.js?"></script>
<script defer src="/js/client-core.js?"></script>
<script defer src="/js/battle-dex-data.js?"></script>
<script defer src="/js/battle-dex.js?"></script>
<script defer src="/js/battle-text-parser.js?"></script>
<script defer src="/js/client-main.js?"></script>
@@ -81,7 +82,6 @@
<script defer src="/js/battle-choices.js?"></script>
<script defer src="/js/panel-battle.js?"></script>
<script defer src="/js/battle-dex-data.js?"></script>
<script defer src="/data/pokedex.js?"></script>
<script defer src="/data/moves.js?"></script>
<script defer src="/data/items.js?"></script>

View File

@@ -162,9 +162,13 @@ class NetRequest {
}
export function Net(uri: string) {
if (uri.startsWith('/') && !uri.startsWith('//') && Net.defaultRoute) uri = Net.defaultRoute + uri;
if (uri.startsWith('//') && document.location.protocol === 'file:') uri = 'https:' + uri;
return new NetRequest(uri);
}
Net.defaultRoute = '';
Net.encodeQuery = function (data: string | PostData) {
if (typeof data === 'string') return data;
let urlencodedData = '';

View File

@@ -1359,7 +1359,7 @@ a.ilink.yours {
-webkit-overflow-scrolling: touch;
overflow-scrolling: touch;
}
.userlist-count {
.userlist-count, .userlist .userlist-count {
text-align: center;
padding: 2px 0;
}

View File

@@ -97,11 +97,13 @@
<script src="../config/testclient-key.js"></script>
<script src="js/client-core.js"></script>
<script src="js/battle-dex-data.js"></script>
<script src="js/battle-dex.js"></script>
<script src="js/battle-text-parser.js"></script>
<script src="js/client-main.js"></script>
<script src="js/lib/sockjs-1.4.0-nwjsfix.min.js"></script>
<script src="js/client-connection.js"></script>
<script> Net.defaultRoute = 'https://play.pokemonshowdown.com'; </script>
<script src="js/lib/preact.min.js"></script>
<script src="js/panels.js"></script>
<script src="js/panel-mainmenu.js"></script>
@@ -124,7 +126,6 @@
<script src="js/battle-choices.js"></script>
<script src="js/panel-battle.js"></script>
<script src="js/battle-dex-data.js"></script>
<script src="data/pokedex.js"></script>
<script src="data/moves.js"></script>
<script src="data/items.js"></script>