From e9b97185b8ba7197d973fe4b61bb24944e43debd Mon Sep 17 00:00:00 2001
From: MrTimscampi <julien.machiels@protonmail.com>
Date: Thu, 6 Aug 2020 23:25:18 +0200
Subject: [PATCH] Fix broken pages

---
 src/components/appRouter.js           | 30 +++++++++++++++------------
 src/plugins/htmlVideoPlayer/plugin.js |  4 ++--
 src/plugins/youtubePlayer/plugin.js   |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index c7495d6460..dc05acc9fd 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -69,27 +69,31 @@ class AppRouter {
     }
 
     showLocalLogin(serverId) {
-        this.show('login.html?serverid=' + serverId);
+        Dashboard.navigate('login.html?serverid=' + serverId);
+    }
+
+    showVideoOsd() {
+        return Dashboard.navigate('video');
     }
 
     showSelectServer() {
-        this.show(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html');
+        Dashboard.navigate(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html');
     }
 
     showWelcome() {
-        this.show(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html');
+        Dashboard.navigate(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html');
     }
 
     showSettings() {
-        this.show('mypreferencesmenu.html');
+        Dashboard.navigate('mypreferencesmenu.html');
     }
 
     showNowPlaying() {
-        this.show('/nowplaying.html');
+        this.show('queue');
     }
 
     beginConnectionWizard() {
-        backdrop.clear();
+        backdrop.clearBackdrop();
         loading.show();
         connectionManager.connect({
             enableAutoLogin: appSettings.enableAutoLogin()
@@ -231,7 +235,7 @@ class AppRouter {
         }
 
         if (level === 'full' || level === 2) {
-            backdrop.clear(true);
+            backdrop.clearBackdrop(true);
             document.documentElement.classList.add('transparentDocument');
             this.backgroundContainer.classList.add('backgroundContainer-transparent');
             this.backdropContainer.classList.add('hide');
@@ -628,27 +632,27 @@ class AppRouter {
     }
 
     showGuide() {
-        this.show('livetv.html?tab=1');
+        Dashboard.navigate('livetv.html?tab=1');
     }
 
     goHome() {
-        this.show('home.html');
+        Dashboard.navigate('home.html');
     }
 
     showSearch() {
-        this.show('search.html');
+        Dashboard.navigate('search.html');
     }
 
     showLiveTV() {
-        this.show('livetv.html');
+        Dashboard.navigate('livetv.html');
     }
 
     showRecordedTV() {
-        this.show('livetv.html?tab=3');
+        Dashboard.navigate('livetv.html?tab=3');
     }
 
     showFavorites() {
-        this.show('home.html?tab=1');
+        Dashboard.navigate('home.html?tab=1');
     }
 
     setTitle(title) {
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index 40fa98c650..dc59604de9 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -822,8 +822,8 @@ function tryRemoveElement(elem) {
                     }
                 });
 
-                if (self._currentPlayOptions.fullscreen) {
-                    appRouter.show('videoosd.html').then(this.onNavigatedToOsd);
+                if (this._currentPlayOptions.fullscreen) {
+                    appRouter.showVideoOsd().then(this.onNavigatedToOsd);
                 } else {
                     appRouter.setTransparency('backdrop');
                     this.#videoDialog.classList.remove('videoPlayerContainer-onTop');
diff --git a/src/plugins/youtubePlayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
index f7b6a04a97..eed75a8116 100644
--- a/src/plugins/youtubePlayer/plugin.js
+++ b/src/plugins/youtubePlayer/plugin.js
@@ -106,7 +106,7 @@ function onPlaying(instance, playOptions, resolve) {
         instance.timeUpdateInterval = setInterval(onTimeUpdate.bind(instance), 500);
 
         if (playOptions.fullscreen) {
-            appRouter.show('videoosd.html').then(function () {
+            appRouter.showVideoOsd().then(function () {
                 instance.videoDialog.classList.remove('onTop');
             });
         } else {