Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

fix loading animation positionning

This commit is contained in:
Nicolas Constant 2019-08-10 15:00:47 -04:00
parent 235e81cccb
commit bf687ebb62
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/components/stream/user-profile/user-profile.component.html
View File

@ -180,19 +180,19 @@
</div> </div>
</div> </div>
<div *ngIf="!isLoading && !statusLoading && statuses.length == 0" class="profile-no-toots">
no status found
</div>
<div *ngIf="statusSection === 'status'">
<div *ngFor="let statusWrapper of pinnedStatuses">
<app-status [statusWrapper]="statusWrapper" (browseHashtagEvent)="browseHashtag($event)"
(browseAccountEvent)="browseAccount($event)" (browseThreadEvent)="browseThread($event)">
</app-status>
</div>
</div>
<div [class.profile__status-switching-section]="isSwitchingSection"> <div [class.profile__status-switching-section]="isSwitchingSection">
<div *ngIf="!isLoading && !statusLoading && statuses.length == 0" class="profile-no-toots">
no status found
</div>
<div *ngIf="statusSection === 'status' && !statusLoading">
<div *ngFor="let statusWrapper of pinnedStatuses">
<app-status [statusWrapper]="statusWrapper" (browseHashtagEvent)="browseHashtag($event)"
(browseAccountEvent)="browseAccount($event)" (browseThreadEvent)="browseThread($event)">
</app-status>
</div>
</div>
<div *ngFor="let statusWrapper of statuses"> <div *ngFor="let statusWrapper of statuses">
<div *ngIf="statusSection !== 'media'"> <div *ngIf="statusSection !== 'media'">
<app-status [statusWrapper]="statusWrapper" (browseHashtagEvent)="browseHashtag($event)" <app-status [statusWrapper]="statusWrapper" (browseHashtagEvent)="browseHashtag($event)"
@ -209,7 +209,7 @@
</div> </div>
<div style="clear: both;"></div> <div style="clear: both;"></div>
<app-waiting-animation *ngIf="statusLoading" class="waiting-icon"></app-waiting-animation> <app-waiting-animation *ngIf="statusLoading" class="waiting-icon"></app-waiting-animation>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

2
src/app/components/stream/user-profile/user-profile.component.scss
View File

@ -344,7 +344,7 @@ $floating-header-height: 60px;
} }
&__status-switching-section { &__status-switching-section {
height: calc(100vh - 35px - #{$floating-header-height} - #{$stream-header-height} - #{$stream-selector-height}); height: calc(100vh - 35px - #{$floating-header-height} - #{$stream-header-height} - #{$stream-selector-height});
} }
&-no-toots { &-no-toots {

12
src/app/components/stream/user-profile/user-profile.component.ts
View File

@ -323,7 +323,7 @@ export class UserProfileComponent implements OnInit {
isSwitchingSection: boolean; isSwitchingSection: boolean;
switchStatusSection(section: 'status' | 'replies' | 'media'): boolean { switchStatusSection(section: 'status' | 'replies' | 'media'): boolean {
this.isSwitchingSection = true; this.isSwitchingSection = true;
this.statusSection = section; this.statusSection = section;
this.statuses.length = 0; this.statuses.length = 0;
@ -346,7 +346,7 @@ export class UserProfileComponent implements OnInit {
} }
if (promise) { if (promise) {
promise promise
.catch(err => { .catch(err => {
}) })
.then(() => { .then(() => {
this.isSwitchingSection = false; this.isSwitchingSection = false;
@ -355,6 +355,14 @@ export class UserProfileComponent implements OnInit {
this.isSwitchingSection = false; this.isSwitchingSection = false;
} }
if (this.showFloatingStatusMenu) {
setTimeout(() => {
var element = this.statustream.nativeElement as HTMLElement;
const menuPosition = element.scrollHeight - this.profilestatuses.nativeElement.offsetHeight - 30 - 29;
element.scrollTop = menuPosition;
}, 0);
}
return false; return false;
} }