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

Merge pull request #14 from dkanada/addserver

Browse source 
Reimplement page to add server
This commit is contained in:
Joshua M. Boniface 2019-01-11 23:46:13 -05:00 • committed by GitHub
commit 02918d066f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 93 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/bower_components/emby-webcomponents/router.js vendored
View file

@ -14,9 +14,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
showWelcome: function () {
show('/startup/welcome.html');
},
showConnectLogin: function () {
show('/startup/connectlogin.html');
},
showSettings: function () {
show('/settings/settings.html');
},
@ -271,14 +268,8 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
// Bounce to the login screen, but not if a password entry fails, obviously
if (!isCurrentAllowed) {
showForcedLogoutMessage(globalize.translate('sharedcomponents#AccessRestrictedTryAgainLater'));
if (connectionManager.isLoggedIntoConnect()) {
appRouter.showConnectLogin();
} else {
appRouter.showLocalLogin(apiClient.serverId());
}
appRouter.showLocalLogin(apiClient.serverId());
}
}
@ -565,7 +556,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
return;
}
// This must result in a call to either
// This must result in a call to either
// skinManager.loadUserSkin();
// Logout
// Or exit app