cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 02:48:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from dkanada/android

Browse Source 
Send android clients to select server before login
This commit is contained in:
Joshua M. Boniface 2019-01-11 23:24:15 -05:00 committed by GitHub
commit 4dc4a26719
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/scripts/site.js
View File

@ -62,7 +62,14 @@ var Dashboard = {
}, },
logout: function(logoutWithServer) { logout: function(logoutWithServer) {
function onLogoutDone() { function onLogoutDone() {
Dashboard.navigate("login.html") var loginPage;
if (AppInfo.isNativeApp) {
loginPage = "selectserver.html";
window.ApiClient = null;
} else {
loginPage = "login.html";
}
Dashboard.navigate(loginPage);
}!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone) }!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone)
}, },
getConfigurationPageUrl: function(name) { getConfigurationPageUrl: function(name) {
@ -1033,7 +1040,7 @@ var Dashboard = {
}, appRouter.showSelectServer = function() { }, appRouter.showSelectServer = function() {
AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html")
}, appRouter.showWelcome = function() { }, appRouter.showWelcome = function() {
Dashboard.navigate("login.html") Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html")
}, appRouter.showSettings = function() { }, appRouter.showSettings = function() {
Dashboard.navigate("mypreferencesmenu.html") Dashboard.navigate("mypreferencesmenu.html")
}, appRouter.showGuide = function() { }, appRouter.showGuide = function() {