From 2bf916ea58a8eb745e3d3af399be4f452e3b3039 Mon Sep 17 00:00:00 2001 From: CakeLancelot Date: Thu, 9 Feb 2023 12:52:57 -0600 Subject: [PATCH] Fix bug in WebPlayer installation logic Also run prettier --- assets/js/serverselector.js | 22 +++++++++++----------- build/afterpack.js | 2 +- index.html | 7 ++++++- index.js | 6 ++---- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/assets/js/serverselector.js b/assets/js/serverselector.js index 0c38438..e05c75a 100644 --- a/assets/js/serverselector.js +++ b/assets/js/serverselector.js @@ -26,20 +26,20 @@ function disableServerListButtons() { } function getAppVersion() { - appversion = remote.require("app").getVersion(); - - // simplify version, ex. 1.4.0 -> 1.4, - // but only if a revision number isn't present - if(appversion.endsWith(".0")){ - return appversion.substr(0, appversion.length - 2) - } else { - return appversion - } + appversion = remote.require("app").getVersion(); + + // simplify version, ex. 1.4.0 -> 1.4, + // but only if a revision number isn't present + if (appversion.endsWith(".0")) { + return appversion.substr(0, appversion.length - 2); + } else { + return appversion; + } } function setAppVersionText() { - $("#of-aboutversionnumber").text("Version " + getAppVersion()); - $("#of-versionnumber").text("v" + getAppVersion()); + $("#of-aboutversionnumber").text("Version " + getAppVersion()); + $("#of-versionnumber").text("v" + getAppVersion()); } function addServer() { diff --git a/build/afterpack.js b/build/afterpack.js index b142d88..915f15c 100644 --- a/build/afterpack.js +++ b/build/afterpack.js @@ -4,7 +4,7 @@ const exefile = './dist/win-ia32-unpacked/OpenFusionClient.exe' exports.default = function() { // remove leftover files from default electron app - fs.rm(dir, { recursive: true }, (err) => { + fs.rm(defaultdir, { recursive: true }, (err) => { if (err) { throw err; } diff --git a/index.html b/index.html index 53c771f..7fb39a5 100644 --- a/index.html +++ b/index.html @@ -151,7 +151,12 @@