From 915589986001f28de69b64f7a7ad4213dbf4b134 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Thu, 3 Dec 2020 16:07:01 -0500 Subject: [PATCH 1/2] Fix emby-button link handling --- src/components/appRouter.js | 1 - src/elements/emby-button/emby-button.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/appRouter.js b/src/components/appRouter.js index ee35a5abb..c02c7edd3 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -20,7 +20,6 @@ class AppRouter { currentViewLoadRequest; firstConnectionResult; forcedLogoutMsg; - handleAnchorClick = page.clickHandler; isDummyBackToHome; msgTimeout; popstateOccurred = false; diff --git a/src/elements/emby-button/emby-button.js b/src/elements/emby-button/emby-button.js index 3d911c6e3..e51fb4f13 100644 --- a/src/elements/emby-button/emby-button.js +++ b/src/elements/emby-button/emby-button.js @@ -18,7 +18,7 @@ function onAnchorClick(e) { shell.openUrl(href); } } else { - appRouter.handleAnchorClick(e); + appRouter.show(href); } } else { e.preventDefault(); From f9ee9aeeb340bf4ef18b39675b85b6805271412e Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Thu, 3 Dec 2020 16:13:27 -0500 Subject: [PATCH 2/2] Fix dashboard tab links --- src/controllers/dashboard/dlna/profiles.js | 4 ++-- src/controllers/dashboard/dlna/settings.js | 4 ++-- src/controllers/dashboard/library.js | 8 ++++---- src/controllers/dashboard/librarydisplay.js | 8 ++++---- src/controllers/dashboard/metadataImages.js | 8 ++++---- src/controllers/dashboard/metadatanfo.js | 8 ++++---- src/controllers/dashboard/plugins/available/index.js | 6 +++--- src/controllers/dashboard/plugins/installed/index.js | 6 +++--- src/controllers/dashboard/plugins/repositories/index.js | 6 +++--- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/controllers/dashboard/dlna/profiles.js b/src/controllers/dashboard/dlna/profiles.js index e507fc4e7..3eedc3472 100644 --- a/src/controllers/dashboard/dlna/profiles.js +++ b/src/controllers/dashboard/dlna/profiles.js @@ -79,10 +79,10 @@ import confirm from '../../../components/confirm/confirm'; function getTabs() { return [{ - href: 'dlnasettings.html', + href: '#!/dlnasettings.html', name: globalize.translate('Settings') }, { - href: 'dlnaprofiles.html', + href: '#!/dlnaprofiles.html', name: globalize.translate('TabProfiles') }]; } diff --git a/src/controllers/dashboard/dlna/settings.js b/src/controllers/dashboard/dlna/settings.js index 33c35b964..4fa8467f3 100644 --- a/src/controllers/dashboard/dlna/settings.js +++ b/src/controllers/dashboard/dlna/settings.js @@ -38,10 +38,10 @@ import Dashboard from '../../../scripts/clientUtils'; function getTabs() { return [{ - href: 'dlnasettings.html', + href: '#!/dlnasettings.html', name: globalize.translate('Settings') }, { - href: 'dlnaprofiles.html', + href: '#!/dlnaprofiles.html', name: globalize.translate('TabProfiles') }]; } diff --git a/src/controllers/dashboard/library.js b/src/controllers/dashboard/library.js index 8bac92d5d..7faf92211 100644 --- a/src/controllers/dashboard/library.js +++ b/src/controllers/dashboard/library.js @@ -359,16 +359,16 @@ import confirm from '../../components/confirm/confirm'; function getTabs() { return [{ - href: 'library.html', + href: '#!/library.html', name: globalize.translate('HeaderLibraries') }, { - href: 'librarydisplay.html', + href: '#!/librarydisplay.html', name: globalize.translate('Display') }, { - href: 'metadataimages.html', + href: '#!/metadataimages.html', name: globalize.translate('Metadata') }, { - href: 'metadatanfo.html', + href: '#!/metadatanfo.html', name: globalize.translate('TabNfoSettings') }]; } diff --git a/src/controllers/dashboard/librarydisplay.js b/src/controllers/dashboard/librarydisplay.js index 7e7bbb7cf..75abfe308 100644 --- a/src/controllers/dashboard/librarydisplay.js +++ b/src/controllers/dashboard/librarydisplay.js @@ -9,16 +9,16 @@ import Dashboard from '../../scripts/clientUtils'; function getTabs() { return [{ - href: 'library.html', + href: '#!/library.html', name: globalize.translate('HeaderLibraries') }, { - href: 'librarydisplay.html', + href: '#!/librarydisplay.html', name: globalize.translate('Display') }, { - href: 'metadataimages.html', + href: '#!/metadataimages.html', name: globalize.translate('Metadata') }, { - href: 'metadatanfo.html', + href: '#!/metadatanfo.html', name: globalize.translate('TabNfoSettings') }]; } diff --git a/src/controllers/dashboard/metadataImages.js b/src/controllers/dashboard/metadataImages.js index 6dda2f1ee..dad9b26ed 100644 --- a/src/controllers/dashboard/metadataImages.js +++ b/src/controllers/dashboard/metadataImages.js @@ -52,16 +52,16 @@ import Dashboard from '../../scripts/clientUtils'; function getTabs() { return [{ - href: 'library.html', + href: '#!/library.html', name: globalize.translate('HeaderLibraries') }, { - href: 'librarydisplay.html', + href: '#!/librarydisplay.html', name: globalize.translate('Display') }, { - href: 'metadataimages.html', + href: '#!/metadataimages.html', name: globalize.translate('Metadata') }, { - href: 'metadatanfo.html', + href: '#!/metadatanfo.html', name: globalize.translate('TabNfoSettings') }]; } diff --git a/src/controllers/dashboard/metadatanfo.js b/src/controllers/dashboard/metadatanfo.js index d3777e478..a8500f273 100644 --- a/src/controllers/dashboard/metadatanfo.js +++ b/src/controllers/dashboard/metadatanfo.js @@ -47,16 +47,16 @@ import alert from '../../components/alert'; function getTabs() { return [{ - href: 'library.html', + href: '#!/library.html', name: globalize.translate('HeaderLibraries') }, { - href: 'librarydisplay.html', + href: '#!/librarydisplay.html', name: globalize.translate('Display') }, { - href: 'metadataimages.html', + href: '#!/metadataimages.html', name: globalize.translate('Metadata') }, { - href: 'metadatanfo.html', + href: '#!/metadatanfo.html', name: globalize.translate('TabNfoSettings') }]; } diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js index e4e7e9dab..ecbc4dac9 100644 --- a/src/controllers/dashboard/plugins/available/index.js +++ b/src/controllers/dashboard/plugins/available/index.js @@ -123,13 +123,13 @@ function getPluginHtml(plugin, options, installedPlugins) { function getTabs() { return [{ - href: 'installedplugins.html', + href: '#!/installedplugins.html', name: globalize.translate('TabMyPlugins') }, { - href: 'availableplugins.html', + href: '#!/availableplugins.html', name: globalize.translate('TabCatalog') }, { - href: 'repositories.html', + href: '#!/repositories.html', name: globalize.translate('TabRepositories') }]; } diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js index d38aa0086..33f9b44ea 100644 --- a/src/controllers/dashboard/plugins/installed/index.js +++ b/src/controllers/dashboard/plugins/installed/index.js @@ -159,13 +159,13 @@ function reloadList(page) { function getTabs() { return [{ - href: 'installedplugins.html', + href: '#!/installedplugins.html', name: globalize.translate('TabMyPlugins') }, { - href: 'availableplugins.html', + href: '#!/availableplugins.html', name: globalize.translate('TabCatalog') }, { - href: 'repositories.html', + href: '#!/repositories.html', name: globalize.translate('TabRepositories') }]; } diff --git a/src/controllers/dashboard/plugins/repositories/index.js b/src/controllers/dashboard/plugins/repositories/index.js index 08a411545..c15d8d7a2 100644 --- a/src/controllers/dashboard/plugins/repositories/index.js +++ b/src/controllers/dashboard/plugins/repositories/index.js @@ -77,13 +77,13 @@ function getRepositoryHtml(repository) { function getTabs() { return [{ - href: 'installedplugins.html', + href: '#!/installedplugins.html', name: globalize.translate('TabMyPlugins') }, { - href: 'availableplugins.html', + href: '#!/availableplugins.html', name: globalize.translate('TabCatalog') }, { - href: 'repositories.html', + href: '#!/repositories.html', name: globalize.translate('TabRepositories') }]; }