mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Fix linting issue

Browse source
This commit is contained in:
MrTimscampi 2020-08-16 21:14:18 +02:00
parent 8d7912cae4
commit bc6a1d5734
1 changed files with 0 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/components/appRouter.js
View file

@ -692,18 +692,12 @@ class AppRouter {
return 'dashboard.html';
}
<<<<<<< HEAD
function show(path, options) {
if (path.indexOf('/') !== 0 && path.indexOf('://') === -1) {
path = '/' + path;
=======
if (item === 'recordedtv') {
return 'livetv.html?tab=3&serverId=' + options.serverId;
}
if (item === 'nextup') {
return 'list.html?type=nextup&serverId=' + options.serverId;
>>>>>>> upstream/master
}
if (item === 'list') {
@ -851,31 +845,4 @@ class AppRouter {
}
}
<<<<<<< HEAD
appRouter.addRoute = addRoute;
appRouter.param = param;
appRouter.back = back;
appRouter.show = show;
appRouter.start = start;
appRouter.baseUrl = baseUrl;
appRouter.canGoBack = canGoBack;
appRouter.current = current;
appRouter.beginConnectionWizard = beginConnectionWizard;
appRouter.invokeShortcut = invokeShortcut;
appRouter.showItem = showItem;
appRouter.setTransparency = setTransparency;
appRouter.getRoutes = getRoutes;
appRouter.pushState = pushState;
appRouter.enableNativeHistory = enableNativeHistory;
appRouter.handleAnchorClick = page.clickHandler;
appRouter.TransparencyLevel = {
None: 0,
Backdrop: 1,
Full: 2
};
return appRouter;
});
=======
export default new AppRouter();
>>>>>>> upstream/master