Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nicht mehr auf UserManager warten

Browse Source
This commit is contained in:
silas 2018-12-01 18:47:13 +01:00
parent f03ed8c3c2
commit 9a59f9f80a
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/js/app.js
View File

@ -4508,10 +4508,12 @@ class UserManager {
return Helper.isNotNull(UserManager.userData) && Helper.isNotNull(UserManager.userData.id); return Helper.isNotNull(UserManager.userData) && Helper.isNotNull(UserManager.userData.id);
} }
} }
UserManager.waitForData = true;
InitPromise.addPromise(function(app){ InitPromise.addPromise(function(app){
UserManager.init(app); UserManager.init(app);
return UserManager.fetchMe("u/me").then(function(){ let userManagerPromise = UserManager.fetchMe("u/me").then(function(){
UserManager.addIsLoggedInListener(function (isLoggedIn) { UserManager.addIsLoggedInListener(function (isLoggedIn) {
if (isLoggedIn) { if (isLoggedIn) {
const settingsManager = SettingsManager.getInstance(); const settingsManager = SettingsManager.getInstance();
@ -4532,6 +4534,10 @@ InitPromise.addPromise(function(app){
} }
}); });
}); });
if (UserManager.waitForData){
return userManagerPromise;
}
}); });
class UserAction extends MenuAction { class UserAction extends MenuAction {
@ -7953,6 +7959,7 @@ SettingsSite.setTemplate("html/application/setting-template.html");
RegistrationSite.addAction = false; RegistrationSite.addAction = false;
LoginSite.addLoginAction = false; LoginSite.addLoginAction = false;
UserManager.waitForData = false;
InitPromise.resolve(app$1).then(async function () { InitPromise.resolve(app$1).then(async function () {
SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS; SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS;

3
src/js/init.js
View File

@ -9,7 +9,7 @@ import {
Translator, Translator,
WhatsappShareButton WhatsappShareButton
} from "./lib/pwa-lib"; } from "./lib/pwa-lib";
import {LoginSite, RegistrationSite} from "./lib/pwa-user-management"; import {LoginSite, RegistrationSite, UserManager} from "./lib/pwa-user-management";
import "./lib/pwa-lib" import "./lib/pwa-lib"
import "./lib/pwa-core" import "./lib/pwa-core"
@ -69,6 +69,7 @@ SettingsSite.setTemplate("html/application/setting-template.html");
RegistrationSite.addAction = false; RegistrationSite.addAction = false;
LoginSite.addLoginAction = false; LoginSite.addLoginAction = false;
UserManager.waitForData = false;
InitPromise.resolve(app).then(async function () { InitPromise.resolve(app).then(async function () {
SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS; SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS;

8
src/js/lib/pwa-user-management.js
View File

@ -72,10 +72,12 @@ class UserManager {
return Helper.isNotNull(UserManager.userData) && Helper.isNotNull(UserManager.userData.id); return Helper.isNotNull(UserManager.userData) && Helper.isNotNull(UserManager.userData.id);
} }
} }
UserManager.waitForData = true;
InitPromise.addPromise(function(app){ InitPromise.addPromise(function(app){
UserManager.init(app); UserManager.init(app);
return UserManager.fetchMe("u/me").then(function(){ let userManagerPromise = UserManager.fetchMe("u/me").then(function(){
UserManager.addIsLoggedInListener(function (isLoggedIn) { UserManager.addIsLoggedInListener(function (isLoggedIn) {
if (isLoggedIn) { if (isLoggedIn) {
const settingsManager = SettingsManager.getInstance(); const settingsManager = SettingsManager.getInstance();
@ -96,6 +98,10 @@ InitPromise.addPromise(function(app){
} }
}); });
}); });
if (UserManager.waitForData){
return userManagerPromise;
}
}); });
class UserAction extends MenuAction { class UserAction extends MenuAction {