Merge pull request #2164 from thornbill/fix-links-maybe

Fix more link issues

src/components/appRouter.js

@@ -20,7 +20,6 @@ class AppRouter {
     currentViewLoadRequest;
     firstConnectionResult;
     forcedLogoutMsg;
-    handleAnchorClick = page.clickHandler;
     isDummyBackToHome;
     msgTimeout;
     popstateOccurred = false;

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')
         }];
     }

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')
         }];
     }

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')
         }];
     }

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')
         }];
     }

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')
         }];
     }

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')
         }];
     }

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')
     }];
 }

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')
     }];
 }

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')
     }];
 }

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();