kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1937 from Legion2/develop

Browse Source 
use relative path for socket.io
This commit is contained in:
Michael Teeuw 2020-03-24 21:13:36 +01:00 committed by GitHub
commit 7ac97f854c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -30,6 +30,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fix regression in currentweather module causing 'undefined' to show up when config.hideTemp is false - Fix regression in currentweather module causing 'undefined' to show up when config.hideTemp is false
- Fix FEELS translation for Croatian - Fix FEELS translation for Croatian
- Fixed weather tests [#1840](https://github.com/MichMich/MagicMirror/issues/1840) - Fixed weather tests [#1840](https://github.com/MichMich/MagicMirror/issues/1840)
- Fixed Socket.io can't be used with Reverse Proxy in serveronly mode [#1934](https://github.com/MichMich/MagicMirror/issues/1934)
- Fix update checking skipping 3rd party modules the first time - Fix update checking skipping 3rd party modules the first time
### Updated ### Updated

2
index.html
View File

@ -37,7 +37,7 @@
<div class="region bottom right"><div class="container"></div></div> <div class="region bottom right"><div class="container"></div></div>
</div> </div>
<div class="region fullscreen above"><div class="container"></div></div> <div class="region fullscreen above"><div class="container"></div></div>
<script type="text/javascript" src="/socket.io/socket.io.js"></script> <script type="text/javascript" src="socket.io/socket.io.js"></script>
<script type="text/javascript" src="vendor/node_modules/nunjucks/browser/nunjucks.min.js"></script> <script type="text/javascript" src="vendor/node_modules/nunjucks/browser/nunjucks.min.js"></script>
<script type="text/javascript" src="js/defaults.js"></script> <script type="text/javascript" src="js/defaults.js"></script>
<script type="text/javascript" src="#CONFIG_FILE#"></script> <script type="text/javascript" src="#CONFIG_FILE#"></script>

4
js/socketclient.js
View File

@ -8,7 +8,9 @@ var MMSocket = function(moduleName) {
self.moduleName = moduleName; self.moduleName = moduleName;
// Private Methods // Private Methods
self.socket = io("/" + self.moduleName); self.socket = io("/" + self.moduleName, {
path: window.location.pathname + "socket.io"
});
var notificationCallback = function() {}; var notificationCallback = function() {};
var onevent = self.socket.onevent; var onevent = self.socket.onevent;