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 broken pages

Browse source
This commit is contained in:
MrTimscampi 2020-08-06 23:25:18 +02:00
parent 4aa0ef4936
commit e9b97185b8
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/components/appRouter.js
View file

@ -69,27 +69,31 @@ class AppRouter {
} }
showLocalLogin(serverId) { showLocalLogin(serverId) {
this.show('login.html?serverid=' + serverId); Dashboard.navigate('login.html?serverid=' + serverId);
}
showVideoOsd() {
return Dashboard.navigate('video');
} }
showSelectServer() { showSelectServer() {
this.show(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html'); Dashboard.navigate(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html');
} }
showWelcome() { showWelcome() {
this.show(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html'); Dashboard.navigate(AppInfo.isNativeApp ? 'selectserver.html' : 'login.html');
} }
showSettings() { showSettings() {
this.show('mypreferencesmenu.html'); Dashboard.navigate('mypreferencesmenu.html');
} }
showNowPlaying() { showNowPlaying() {
this.show('/nowplaying.html'); this.show('queue');
} }
beginConnectionWizard() { beginConnectionWizard() {
backdrop.clear(); backdrop.clearBackdrop();
loading.show(); loading.show();
connectionManager.connect({ connectionManager.connect({
enableAutoLogin: appSettings.enableAutoLogin() enableAutoLogin: appSettings.enableAutoLogin()
@ -231,7 +235,7 @@ class AppRouter {
} }
if (level === 'full' || level === 2) { if (level === 'full' || level === 2) {
backdrop.clear(true); backdrop.clearBackdrop(true);
document.documentElement.classList.add('transparentDocument'); document.documentElement.classList.add('transparentDocument');
this.backgroundContainer.classList.add('backgroundContainer-transparent'); this.backgroundContainer.classList.add('backgroundContainer-transparent');
this.backdropContainer.classList.add('hide'); this.backdropContainer.classList.add('hide');
@ -628,27 +632,27 @@ class AppRouter {
} }
showGuide() { showGuide() {
this.show('livetv.html?tab=1'); Dashboard.navigate('livetv.html?tab=1');
} }
goHome() { goHome() {
this.show('home.html'); Dashboard.navigate('home.html');
} }
showSearch() { showSearch() {
this.show('search.html'); Dashboard.navigate('search.html');
} }
showLiveTV() { showLiveTV() {
this.show('livetv.html'); Dashboard.navigate('livetv.html');
} }
showRecordedTV() { showRecordedTV() {
this.show('livetv.html?tab=3'); Dashboard.navigate('livetv.html?tab=3');
} }
showFavorites() { showFavorites() {
this.show('home.html?tab=1'); Dashboard.navigate('home.html?tab=1');
} }
setTitle(title) { setTitle(title) {

4
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -822,8 +822,8 @@ function tryRemoveElement(elem) {
} }
}); });
if (self._currentPlayOptions.fullscreen) { if (this._currentPlayOptions.fullscreen) {
appRouter.show('videoosd.html').then(this.onNavigatedToOsd); appRouter.showVideoOsd().then(this.onNavigatedToOsd);
} else { } else {
appRouter.setTransparency('backdrop'); appRouter.setTransparency('backdrop');
this.#videoDialog.classList.remove('videoPlayerContainer-onTop'); this.#videoDialog.classList.remove('videoPlayerContainer-onTop');

2
src/plugins/youtubePlayer/plugin.js
View file

@ -106,7 +106,7 @@ function onPlaying(instance, playOptions, resolve) {
instance.timeUpdateInterval = setInterval(onTimeUpdate.bind(instance), 500); instance.timeUpdateInterval = setInterval(onTimeUpdate.bind(instance), 500);
if (playOptions.fullscreen) { if (playOptions.fullscreen) {
appRouter.show('videoosd.html').then(function () { appRouter.showVideoOsd().then(function () {
instance.videoDialog.classList.remove('onTop'); instance.videoDialog.classList.remove('onTop');
}); });
} else { } else {