Skip to content

Commit

Permalink
Fix SockJS when using the desktop client (smogon#1360)
Browse files Browse the repository at this point in the history
* Patch SockJS v1.4.0 to work with nw.js

* Document how to upgrade SockJS in UPGRADING-SOCKJS.md
  • Loading branch information
Kaiepi authored and Zarel committed Sep 4, 2019
1 parent 6b66a03 commit 29bab1b
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 4 deletions.
15 changes: 15 additions & 0 deletions UPGRADING-SOCKJS.md
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion index.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ <h3><button class="closebutton" tabindex="-1"><i class="fa fa-times-circle"></i>
<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>
Expand Down
3 changes: 3 additions & 0 deletions js/lib/sockjs-1.4.0-nwjsfix.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion preactalpha.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h3><button class="closebutton" tabindex="-1" aria-label="Close"><i class="fa fa

<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>
Expand Down
2 changes: 1 addition & 1 deletion testclient-beta.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h3><button class="closebutton" tabindex="-1" aria-label="Close"><i class="fa fa

<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>
Expand Down
2 changes: 1 addition & 1 deletion testclient.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h3><button class="closebutton" tabindex="-1" aria-label="Close"><i class="fa fa
<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>
Expand Down

0 comments on commit 29bab1b

Please sign in to comment.