ztimson/legio-30
ztimson/legio-30
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Fixed back navigation

Browse Source
This commit is contained in:
Zakary Timson 2024-01-11 16:39:00 -05:00
parent 17ab9b874d
commit 94fc4549c9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/components/navbar/navbar.component.ts
View File

@ -1,5 +1,5 @@
import {AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output} from '@angular/core'; import {AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output} from '@angular/core';
import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; import {ActivatedRoute, NavigationEnd, NavigationStart, Router} from '@angular/router';
import {combineLatest, filter, Subscription} from 'rxjs'; import {combineLatest, filter, Subscription} from 'rxjs';
import {NAVIGATION} from '../../misc/navigation'; import {NAVIGATION} from '../../misc/navigation';
import {BreakpointService} from '../../services/breakpoint.service'; import {BreakpointService} from '../../services/breakpoint.service';
@ -24,8 +24,7 @@ export class NavbarComponent implements AfterViewInit, OnDestroy {
constructor(private route: ActivatedRoute, private router: Router, public breakpoint: BreakpointService) { } constructor(private route: ActivatedRoute, private router: Router, public breakpoint: BreakpointService) { }
ngAfterViewInit() { ngAfterViewInit() {
this.sub = combineLatest([this.router.events.pipe(filter(e => e instanceof NavigationEnd)), this.route.fragment]).subscribe(([url, frag]) => { this.sub = combineLatest([this.router.events.pipe(filter((e: any) => e.navigationTrigger != 'popstate' || e instanceof NavigationStart)), this.route.fragment]).subscribe(([url, frag]) => {
console.log('fire');
if(frag) this.scroll(frag); if(frag) this.scroll(frag);
else this.scrollTop(); else this.scrollTop();
}); });