From fc7002fbab3daf2fa6b77349f77cf9c6d4ee0f27 Mon Sep 17 00:00:00 2001
From: Matthieu Hostache <matthieu.hostache@gmail.com>
Date: Mon, 28 Sep 2020 12:14:04 +0200
Subject: [PATCH] Fix blank webui on some browsers

---
 webui/package-lock.json                  | 5 -----
 webui/package.json                       | 1 -
 webui/src/components/_commons/NavBar.vue | 3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/webui/package-lock.json b/webui/package-lock.json
index 9f66f9475..cedd76259 100644
--- a/webui/package-lock.json
+++ b/webui/package-lock.json
@@ -12488,11 +12488,6 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
-    "semver-regex": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.1.tgz",
-      "integrity": "sha512-3dPcmFqxblWB/cppQ2qXWqlp9b6GLgAS032+Ec5E0waDVHTkwYIL+7BFI9UqEe0tkoHle2f3pBgvT/Xl95+Dig=="
-    },
     "send": {
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
diff --git a/webui/package.json b/webui/package.json
index 69c92ed13..3a4665be0 100644
--- a/webui/package.json
+++ b/webui/package.json
@@ -26,7 +26,6 @@
     "moment": "^2.24.0",
     "quasar": "^1.4.4",
     "query-string": "^6.13.1",
-    "semver-regex": "^3.1.1",
     "vh-check": "^2.0.5",
     "vue-chartjs": "^3.4.2",
     "vuex-map-fields": "^1.3.4"
diff --git a/webui/src/components/_commons/NavBar.vue b/webui/src/components/_commons/NavBar.vue
index 549cb7911..2b577ab6b 100644
--- a/webui/src/components/_commons/NavBar.vue
+++ b/webui/src/components/_commons/NavBar.vue
@@ -46,7 +46,6 @@
 import config from '../../../package'
 import PlatformAuthState from '../platform/PlatformAuthState'
 import { mapActions, mapGetters } from 'vuex'
-import semverRegex from 'semver-regex'
 
 export default {
   name: 'NavBar',
@@ -55,7 +54,7 @@ export default {
     ...mapGetters('core', { coreVersion: 'version' }),
     version () {
       if (!this.coreVersion.Version) return null
-      return semverRegex().test(this.coreVersion.Version)
+      return /^(v?\d+\.\d+)/.test(this.coreVersion.Version)
         ? this.coreVersion.Version
         : this.coreVersion.Version.substring(0, 7)
     },