MOBILE-3814 user-menu: Add loading spinner
parent
b0165e87e4
commit
74670a2702
|
@ -13,6 +13,7 @@
|
||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
|
<core-loading [hideUntil]="siteLogoLoaded && handlersLoaded">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
<ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo" lines="full" detail="false" [href]="siteUrl"
|
<ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo" lines="full" detail="false" [href]="siteUrl"
|
||||||
core-link auto-login="yes">
|
core-link auto-login="yes">
|
||||||
|
@ -66,6 +67,7 @@
|
||||||
</ion-label>
|
</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
|
</core-loading>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
<ion-footer>
|
<ion-footer>
|
||||||
<ion-item *ngIf="displaySwitchAccount" button lines="full" (click)="switchAccounts($event)" detail="true" class="ion-text-wrap">
|
<ion-item *ngIf="displaySwitchAccount" button lines="full" (click)="switchAccounts($event)" detail="true" class="ion-text-wrap">
|
||||||
|
|
|
@ -49,7 +49,6 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
|
||||||
siteUrl?: string;
|
siteUrl?: string;
|
||||||
handlers: CoreUserProfileHandlerData[] = [];
|
handlers: CoreUserProfileHandlerData[] = [];
|
||||||
handlersLoaded = false;
|
handlersLoaded = false;
|
||||||
loaded = false;
|
|
||||||
user?: CoreUserProfile;
|
user?: CoreUserProfile;
|
||||||
displaySwitchAccount = true;
|
displaySwitchAccount = true;
|
||||||
removeAccountOnLogout = false;
|
removeAccountOnLogout = false;
|
||||||
|
@ -68,8 +67,6 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
|
||||||
this.displaySwitchAccount = !currentSite.isFeatureDisabled('NoDelegate_SwitchAccount');
|
this.displaySwitchAccount = !currentSite.isFeatureDisabled('NoDelegate_SwitchAccount');
|
||||||
this.removeAccountOnLogout = !!CoreConstants.CONFIG.removeaccountonlogout;
|
this.removeAccountOnLogout = !!CoreConstants.CONFIG.removeaccountonlogout;
|
||||||
|
|
||||||
this.loaded = true;
|
|
||||||
|
|
||||||
this.loadSiteLogo(currentSite);
|
this.loadSiteLogo(currentSite);
|
||||||
|
|
||||||
// Load the handlers.
|
// Load the handlers.
|
||||||
|
|
Loading…
Reference in New Issue