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

Fix SockJS when using the desktop client (#1360)

Browse Source 
* Patch SockJS v1.4.0 to work with nw.js

* Document how to upgrade SockJS in UPGRADING-SOCKJS.md
This commit is contained in:
Ben Davies 2019-09-04 16:54:03 -03:00 committed by Guangcong Luo
parent 6b66a0322e
commit 29bab1bfdf
6 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
UPGRADING-SOCKJS.md Normal file
View File

@ -0,0 +1,15 @@
Upgrading SockJS
=======================================================================
When SockJS needs to be upgraded, you will also need to patch it to work
properly with nw.js. In the minified script, replace all instances of this:
```javascript
.call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})
```
With this:
```javascript
.call(this,window)
```

2
index.template.html
View File

@ -120,7 +120,7 @@ ga('send', 'pageview');
<script src="//play.pokemonshowdown.com/data/pokedex-mini.js?"></script>
<script src="//play.pokemonshowdown.com/data/typechart.js?"></script>
<script src="//play.pokemonshowdown.com/js/battle.js?"></script>
<script src="//play.pokemonshowdown.com/js/lib/sockjs-1.4.0.min.js"></script>
<script src="//play.pokemonshowdown.com/js/lib/sockjs-1.4.0-nwjsfix.min.js"></script>
<script src="//play.pokemonshowdown.com/js/lib/color-thief.min.js"></script>
<script>

3
js/lib/sockjs-1.4.0-nwjsfix.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
preactalpha.template.html
View File

@ -55,7 +55,7 @@
<script defer src="/js/battle-dex.js?"></script>
<script defer src="/js/client-main.js?"></script>
<script defer src="/js/lib/sockjs-1.4.0.min.js?"></script>
<script defer src="/js/lib/sockjs-1.4.0-nwjsfix.min.js?"></script>
<script defer src="/js/client-connection.js?"></script>
<script defer src="/js/lib/preact.min.js?"></script>
<script defer src="/js/panels.js?"></script>

2
testclient-beta.html
View File

@ -56,7 +56,7 @@
<script src="js/battle-dex.js"></script>
<script src="js/client-main.js"></script>
<script src="js/lib/sockjs-1.4.0.min.js"></script>
<script src="js/lib/sockjs-1.4.0-nwjsfix.min.js"></script>
<script src="js/client-connection.js"></script>
<script src="js/lib/preact.min.js"></script>
<script src="js/panels.js"></script>

2
testclient.html
View File

@ -90,7 +90,7 @@
<script src="data/pokedex-mini-bw.js" onerror="loadRemoteData(this.src)"></script>
<script src="data/typechart.js" onerror="loadRemoteData(this.src)"></script>
<script src="js/battle.js"></script>
<script src="js/lib/sockjs-1.4.0.min.js"></script>
<script src="js/lib/sockjs-1.4.0-nwjsfix.min.js"></script>
<script src="js/lib/color-thief.min.js"></script>
<script>