1
1
import { Component , ElementRef , Inject , Input , OnInit } from '@angular/core' ;
2
2
import { DOCUMENT } from '@angular/platform-browser' ;
3
3
import { ActivatedRoute , NavigationEnd , Router } from '@angular/router' ;
4
- import 'rxjs/add/observable/fromEvent' ;
5
- import 'rxjs/add/operator/debounceTime' ;
6
- import 'rxjs/add/operator/takeUntil' ;
7
- import { Observable } from 'rxjs/Observable' ;
8
4
import { Subject } from 'rxjs/Subject' ;
5
+ import { debounceTime } from 'rxjs/operators/debounceTime' ;
6
+ import { takeUntil } from 'rxjs/operators/takeUntil' ;
7
+ import { fromEvent } from 'rxjs/observable/fromEvent' ;
8
+
9
9
10
10
interface Link {
11
11
/* id of the section*/
@@ -45,7 +45,7 @@ export class TableOfContents implements OnInit {
45
45
private _element : ElementRef ,
46
46
@Inject ( DOCUMENT ) private _document : Document ) {
47
47
48
- this . _router . events . takeUntil ( this . _destroyed ) . subscribe ( ( event ) => {
48
+ this . _router . events . pipe ( takeUntil ( this . _destroyed ) ) . subscribe ( ( event ) => {
49
49
if ( event instanceof NavigationEnd ) {
50
50
const rootUrl = _router . url . split ( '#' ) [ 0 ] ;
51
51
if ( rootUrl !== this . _rootUrl ) {
@@ -55,7 +55,7 @@ export class TableOfContents implements OnInit {
55
55
}
56
56
} ) ;
57
57
58
- this . _route . fragment . takeUntil ( this . _destroyed ) . subscribe ( fragment => {
58
+ this . _route . fragment . pipe ( takeUntil ( this . _destroyed ) ) . subscribe ( fragment => {
59
59
this . _urlFragment = fragment ;
60
60
61
61
const target = document . getElementById ( this . _urlFragment ) ;
@@ -72,9 +72,9 @@ export class TableOfContents implements OnInit {
72
72
this . _scrollContainer = this . container ?
73
73
this . _document . querySelectorAll ( this . container ) [ 0 ] : window ;
74
74
75
- Observable . fromEvent ( this . _scrollContainer , 'scroll' )
76
- . takeUntil ( this . _destroyed )
77
- . debounceTime ( 10 )
75
+ fromEvent ( this . _scrollContainer , 'scroll' ) . pipe (
76
+ takeUntil ( this . _destroyed ) ,
77
+ debounceTime ( 10 ) )
78
78
. subscribe ( ( ) => this . onScroll ( ) ) ;
79
79
} ) ;
80
80
}
0 commit comments