Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependabot(npm): bump rxjs from 6.6.3 to 7.8.1 #459

Merged
merged 2 commits into from
Aug 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ngx-clipboard": "^16.0.0",
"nouislider": "15.7.1",
"popper.js": "1.16.1",
"rxjs": "6.6.3",
"rxjs": "7.8.1",
"rxjs-compat": "6.6.7",
"zone.js": "^0.13.1"
},
Expand Down
16 changes: 12 additions & 4 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, Inject, Renderer2, ElementRef, ViewChild, HostListener } from '@angular/core';
import { Router, NavigationEnd, UrlTree } from '@angular/router';
import { Subscription } from 'rxjs/Subscription';
import 'rxjs/add/operator/filter';
import { Subscription } from 'rxjs';
import { filter } from 'rxjs/operators';
import { DOCUMENT } from '@angular/common';
import { LocationStrategy, PlatformLocation, Location } from '@angular/common';

Expand All @@ -14,10 +14,18 @@ var navbarHeight = 0;
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
})

export class AppComponent implements OnInit {
private _router: Subscription;

constructor(private renderer: Renderer2, private router: Router, @Inject(DOCUMENT,) private document: any, private element: ElementRef, public location: Location) { }
constructor(
private renderer: Renderer2,
private router: Router,
@Inject(DOCUMENT,)
private document: any,
private element: ElementRef,
public location: Location
) { }

@HostListener('window:scroll', ['$event'])
hasScrolled() {
Expand Down Expand Up @@ -54,7 +62,7 @@ export class AppComponent implements OnInit {

ngOnInit() {
var navbar: HTMLElement = this.element.nativeElement.children[0].children[0];
this._router = this.router.events.filter(event => event instanceof NavigationEnd).subscribe((event: NavigationEnd) => {
this._router = this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {

var urlTree: UrlTree = this.router.parseUrl(event.url);
if(urlTree.queryParams.referrer) {
Expand Down