From 3c0dbeedd5dc2f8f697acbb23d1c69f6ce5f719a Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 11 Jan 2019 16:13:57 +0900 Subject: [PATCH 1/3] send android clients to select server before login --- src/scripts/site.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index 5a41d3bdba..29131c466d 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -62,7 +62,8 @@ var Dashboard = { }, logout: function(logoutWithServer) { function onLogoutDone() { - Dashboard.navigate("login.html") + var loginPage; + AppInfo.isNativeApp ? (loginPage = "selectserver.html", window.ApiClient = null) : loginPage = "login.html", Dashboard.navigate(loginPage) }!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone) }, getConfigurationPageUrl: function(name) { @@ -1033,7 +1034,7 @@ var Dashboard = { }, appRouter.showSelectServer = function() { AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") }, appRouter.showWelcome = function() { - Dashboard.navigate("login.html") + AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") }, appRouter.showSettings = function() { Dashboard.navigate("mypreferencesmenu.html") }, appRouter.showGuide = function() { From 3eb533d4bb77362328bec358e2c7ea41c5bade11 Mon Sep 17 00:00:00 2001 From: Vasily Date: Fri, 11 Jan 2019 23:11:36 +0900 Subject: [PATCH 2/3] improve readability of logout function Co-Authored-By: dkanada --- src/scripts/site.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index 29131c466d..a438bc3ca1 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -63,7 +63,13 @@ var Dashboard = { logout: function(logoutWithServer) { function onLogoutDone() { var loginPage; - AppInfo.isNativeApp ? (loginPage = "selectserver.html", window.ApiClient = null) : loginPage = "login.html", Dashboard.navigate(loginPage) + if (AppInfo.isNativeApp) { + loginPage = "selectserver.html"; + window.ApiClient = null; + } else { + loginPage = "login.html"; + } + Dashboard.navigate(loginPage); }!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone) }, getConfigurationPageUrl: function(name) { From dd3d5ef9dcd00e47ee4da5e218d3a61d43eb44ec Mon Sep 17 00:00:00 2001 From: Vasily Date: Fri, 11 Jan 2019 23:12:11 +0900 Subject: [PATCH 3/3] simplify ternary expression Co-Authored-By: dkanada --- src/scripts/site.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index a438bc3ca1..070bcb43c5 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -1040,7 +1040,7 @@ var Dashboard = { }, appRouter.showSelectServer = function() { AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") }, appRouter.showWelcome = function() { - AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") + Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html") }, appRouter.showSettings = function() { Dashboard.navigate("mypreferencesmenu.html") }, appRouter.showGuide = function() {