Skip to content

Commit 0b7ef8d

Browse files
committed
fix: config defaults when loading config
1 parent cce1009 commit 0b7ef8d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

js/src/init.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ var _trackPlayer = null;
2626
var playerCount = 0;
2727
var _overlays = [];
2828
var _disabledBlips = [];
29-
3029
window.changeServer = function (nameOfServer) {
3130
console.log("Changing connected server to: " + nameOfServer);
3231
if (!(nameOfServer in config.servers)) {
@@ -38,7 +37,6 @@ window.changeServer = function (nameOfServer) {
3837
}
3938

4039
window.connectedTo = config.servers[nameOfServer];
41-
//window.connectedTo = Object.assign(config.defaults, connectedTo);
4240

4341
window.connectedTo.getBlipUrl = function () {
4442
if (this.reverseProxy && this.reverseProxy.blips) {
@@ -83,10 +81,12 @@ function globalInit() {
8381

8482
for (const serverName in config.servers) {
8583
// Make sure all servers inherit defaults if they need
86-
config.servers[serverName] = Object.assign(config.servers[serverName], config.defaults);
84+
var o = Object.assign({}, config.defaults, config.servers[serverName]);
85+
if (config.debug) console.log(o);
86+
config.servers[serverName] = o;
8787
}
8888

89-
changeServer(Object.keys(p.servers)[0]);
89+
changeServer(Object.keys(p.servers)[0]); // Show the stuff for the first server in the config.
9090

9191
initMarkers();
9292
initPage();

0 commit comments

Comments
 (0)