11import { Component , ElementRef , Inject , Input , OnInit } from '@angular/core' ;
22import { DOCUMENT } from '@angular/platform-browser' ;
33import { 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' ;
84import { 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+
99
1010interface Link {
1111 /* id of the section*/
@@ -45,7 +45,7 @@ export class TableOfContents implements OnInit {
4545 private _element : ElementRef ,
4646 @Inject ( DOCUMENT ) private _document : Document ) {
4747
48- this . _router . events . takeUntil ( this . _destroyed ) . subscribe ( ( event ) => {
48+ this . _router . events . pipe ( takeUntil ( this . _destroyed ) ) . subscribe ( ( event ) => {
4949 if ( event instanceof NavigationEnd ) {
5050 const rootUrl = _router . url . split ( '#' ) [ 0 ] ;
5151 if ( rootUrl !== this . _rootUrl ) {
@@ -55,7 +55,7 @@ export class TableOfContents implements OnInit {
5555 }
5656 } ) ;
5757
58- this . _route . fragment . takeUntil ( this . _destroyed ) . subscribe ( fragment => {
58+ this . _route . fragment . pipe ( takeUntil ( this . _destroyed ) ) . subscribe ( fragment => {
5959 this . _urlFragment = fragment ;
6060
6161 const target = document . getElementById ( this . _urlFragment ) ;
@@ -72,9 +72,9 @@ export class TableOfContents implements OnInit {
7272 this . _scrollContainer = this . container ?
7373 this . _document . querySelectorAll ( this . container ) [ 0 ] : window ;
7474
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 ) )
7878 . subscribe ( ( ) => this . onScroll ( ) ) ;
7979 } ) ;
8080 }
0 commit comments