From e6c0011789bb5619c4ba00fc00b30730b184b886 Mon Sep 17 00:00:00 2001 From: Leon Kiefer Date: Mon, 6 Apr 2020 21:29:55 +0200 Subject: [PATCH] renamed basename to basePath --- config/config.js.sample | 4 ++-- js/defaults.js | 2 +- js/socketclient.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/config.js.sample b/config/config.js.sample index 514a92f9..5d26b320 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -15,8 +15,8 @@ var config = { // - "0.0.0.0", "::" to listen on any interface // Default, when address config is left out or empty, is "localhost" port: 8080, - basename: "/", // The URL pathname where MagicMirror is hosted. If you are using a Reverse proxy - // you must set the sub path here. basename must end with a / + basePath: "/", // The URL path where MagicMirror is hosted. If you are using a Reverse proxy + // you must set the sub path here. basePath must end with a / ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses // or add a specific IPv4 of 192.168.1.5 : // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"], diff --git a/js/defaults.js b/js/defaults.js index b005e70c..dc246298 100644 --- a/js/defaults.js +++ b/js/defaults.js @@ -15,7 +15,7 @@ if (typeof(mmPort) !== "undefined") { var defaults = { address: address, port: port, - basename: "/", + basePath: "/", kioskmode: false, electronOptions: {}, ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], diff --git a/js/socketclient.js b/js/socketclient.js index 2eb2c6b8..7be9ce7d 100644 --- a/js/socketclient.js +++ b/js/socketclient.js @@ -9,7 +9,7 @@ var MMSocket = function(moduleName) { // Private Methods self.socket = io("/" + self.moduleName, { - path: config.basename + "socket.io" + path: config.basePath + "socket.io" }); var notificationCallback = function() {};